diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java
index 30d32f05c8..bde81ed604 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java
@@ -249,7 +249,9 @@ void findAllByQueryWithConflictingSort() {
 
 		CriteriaDefinition criteria = CriteriaDefinition.empty();
 		Query query = Query.query(criteria);
-		query.sort(Sort.by(Sort.Direction.ASC, "id"));
+        query = query.sort(Sort.by(Sort.Direction.ASC, "id"));
+        query = query.offset(23);
+        query = query.limit(11);
 
 		Pageable pageable = PageRequest.of(0, 3, Sort.by(Sort.Direction.DESC, "name"));
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java
index 50f2989e5f..18e0375cd2 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java
@@ -975,9 +975,9 @@ void selectByQueryWithRedundantPagination() {
 
 		Criteria criteria = Criteria.where("name").is(probe.name);
 		Query query = Query.query(criteria);
-		query.sort(Sort.by(Sort.Order.asc("id")));
-		query.offset(23);
-		query.limit(11);
+        query = query.sort(Sort.by(Sort.Order.asc("id")));
+        query = query.offset(23);
+        query = query.limit(11);
 
 		PageRequest pageRequest = PageRequest.of(2, 1, Sort.by(Sort.Order.asc("name")));
 
@@ -991,7 +991,8 @@ void selectByQueryWithRedundantPagination() {
 				.containsIgnoringCase("LIMIT 1") //
 				.containsIgnoringCase("OFFSET 2 LIMIT 1") //
 				.doesNotContainIgnoringCase("LIMIT 11") //
-				.doesNotContainIgnoringCase("OFFSET 23");
+				.doesNotContainIgnoringCase("OFFSET 23")
+                .doesNotContainIgnoringCase("dummy_entity.id1 ASC");
 
 		assertThat(parameterSource.getValues()) //
 				.containsOnly(entry("x_name", probe.name));