diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java
index 9405dacc..c60fea66 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java
@@ -31,12 +31,11 @@ import org.springframework.data.config.ParsingUtils;
 import org.springframework.data.couchbase.config.BeanNames;
 import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.core.mapping.event.AuditingEventListener;
-import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.Assert;
 
 /**
- * A support registrar that allows to set up auditing for Couchbase (including {@link AuditingHandler}
- * and {@link IsNewStrategyFactory} set up). See {@link EnableCouchbaseAuditing} for the associated annotation.
+ * A support registrar that allows to set up auditing for Couchbase ({@link AuditingHandler} set up).
+ * See {@link EnableCouchbaseAuditing} for the associated annotation.
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
diff --git a/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java b/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java
index 2994d66f..05a5e988 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java
@@ -1,5 +1,6 @@
 package org.springframework.data.couchbase.repository;
 
+import static org.springframework.data.domain.Sort.Direction;
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -136,7 +137,7 @@ public class RepositoryIndexUsageTest {
   @Test
   public void testFindAllSortedUsesN1qlWithConfiguredConsistencyAndOrderBy() {
     String expectedOrderClause = "ORDER BY `length` ASC";
-    Sort sort = new Sort(Sort.Direction.ASC, "length");
+    Sort sort = Sort.by(Direction.ASC, "length");
     repository.findAll(sort);
 
     verify(couchbaseOperations, never()).findByView(any(ViewQuery.class), any(Class.class));
@@ -154,7 +155,7 @@ public class RepositoryIndexUsageTest {
   @Test
   public void testFindAllPagedUsesUsesN1qlConfiguredConsistencyAndLimitOffset() {
     String expectedLimitClause = "LIMIT 10 OFFSET 0";
-    repository.findAll(new PageRequest(0, 10));
+    repository.findAll(PageRequest.of(0, 10));
 
     verify(couchbaseOperations, never()).findByView(any(ViewQuery.class), any(Class.class));
     verify(couchbaseOperations, never()).queryView(any(ViewQuery.class));
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java b/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java
index 390b2fc5..34ce06a0 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java
@@ -64,7 +64,7 @@ public class PartTreeN1qBasedQueryTest {
 	@Test
 	public void testGetCountExcludesStaticSortClause() throws Exception {
 
-		PageRequest pr = new PageRequest(0, 10);
+		PageRequest pr = PageRequest.of(0, 10);
 
 		CouchbaseOperations couchbaseOperations = mock(CouchbaseOperations.class);
 		CouchbaseBucket couchbaseBucket = mock(CouchbaseBucket.class);
@@ -108,8 +108,8 @@ public class PartTreeN1qBasedQueryTest {
 	@Test
 	public void testGetCountExcludesDynamicSortClause() throws Exception {
 
-		Sort sort = new Sort(Direction.ASC, "name");
-		PageRequest pr = new PageRequest(0, 10, sort);
+		Sort sort = Sort.by(Direction.ASC, "name");
+		PageRequest pr = PageRequest.of(0, 10, sort);
 
 		CouchbaseOperations couchbaseOperations = mock(CouchbaseOperations.class);
 		CouchbaseBucket couchbaseBucket = mock(CouchbaseBucket.class);
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/support/N1qlUtilsTest.java b/src/test/java/org/springframework/data/couchbase/repository/query/support/N1qlUtilsTest.java
index a2285360..df2f732e 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/support/N1qlUtilsTest.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/support/N1qlUtilsTest.java
@@ -12,6 +12,7 @@ import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.repository.query.CouchbaseEntityInformation;
 import org.springframework.data.couchbase.repository.query.CountFragment;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.repository.core.EntityMetadata;
@@ -92,7 +93,7 @@ public class N1qlUtilsTest {
   public void testCreateSortUsesPropertiesAsIsWithEscaping() throws Exception {
     CouchbaseConverter converter = mock(CouchbaseConverter.class);
     com.couchbase.client.java.query.dsl.Sort[] realSort =
-        N1qlUtils.createSort(new Sort("description", "attendees"), converter);
+        N1qlUtils.createSort(Sort.by("description", "attendees"), converter);
 
     assertEquals(2, realSort.length);
     assertEquals(com.couchbase.client.java.query.dsl.Sort.asc("`description`").toString(), realSort[0].toString());
@@ -104,10 +105,7 @@ public class N1qlUtilsTest {
   @Test
   public void testCreateSortIgnoresCaseWhenSpecified() throws Exception {
     CouchbaseConverter converter = mock(CouchbaseConverter.class);
-    Sort sortDescription = new Sort(
-            new Sort.Order(Sort.Direction.ASC, "description").ignoreCase(),
-            new Sort.Order(Sort.Direction.ASC, "attendees")
-    );
+    Sort sortDescription = Sort.by(Order.asc("description").ignoreCase(), Order.asc("attendees"));
     com.couchbase.client.java.query.dsl.Sort[] realSort = N1qlUtils.createSort(sortDescription, converter);
 
     assertEquals(2, realSort.length);
@@ -152,7 +150,7 @@ public class N1qlUtilsTest {
   public void testOrderByWithNestedField() throws Exception {
     CouchbaseConverter converter = mock(CouchbaseConverter.class);
     com.couchbase.client.java.query.dsl.Sort[] realSort =
-            N1qlUtils.createSort(new Sort("party.attendees"), converter);
+            N1qlUtils.createSort(Sort.by("party.attendees"), converter);
 
     assertEquals("`party`.`attendees` ASC", realSort[0].toString());
     verifyZeroInteractions(converter);