diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java
new file mode 100644
index 000000000..ecc1a44ad
--- /dev/null
+++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java
@@ -0,0 +1,65 @@
+/*
+* Copyright 2020 the original author or authors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      https://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.springframework.data.relational.core.query;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.Test;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Tests the {@link Query} class.
+ * 
+ * @author Jens Schauder
+ */
+public class QueryUnitTests {
+
+	@Test // DATAJDBC614
+	public void withCombinesSortAndPaging() {
+
+		Query query = Query.empty() //
+				.sort(Sort.by("alpha")) //
+				.with(PageRequest.of(2, 20, Sort.by("beta")));
+
+		assertThat(query.getSort().get()) //
+				.extracting(Sort.Order::getProperty) //
+				.containsExactly("alpha", "beta");
+	}
+
+	@Test // DATAJDBC614
+	public void withCombinesEmptySortAndPaging() {
+
+		Query query = Query.empty() //
+				.with(PageRequest.of(2, 20, Sort.by("beta")));
+
+		assertThat(query.getSort().get()) //
+				.extracting(Sort.Order::getProperty) //
+				.containsExactly("beta");
+	}
+
+	@Test // DATAJDBC614
+	public void withCombinesSortAndUnsortedPaging() {
+
+		Query query = Query.empty() //
+				.sort(Sort.by("alpha")) //
+				.with(PageRequest.of(2, 20));
+
+		assertThat(query.getSort().get()) //
+				.extracting(Sort.Order::getProperty) //
+				.containsExactly("alpha");
+	}
+}