diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/CompareToH2BaseTestCase.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/CompareToH2BaseTestCase.java
similarity index 98%
rename from sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/CompareToH2BaseTestCase.java
rename to sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/CompareToH2BaseTestCase.java
index e81f9551e08..25d83a606e9 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/CompareToH2BaseTestCase.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/CompareToH2BaseTestCase.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.sql.jdbc.query;
+package org.elasticsearch.xpack.sql.jdbc.compare;
 
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
@@ -29,7 +29,7 @@ import java.util.Map;
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
-import static org.elasticsearch.xpack.sql.jdbc.query.JdbcAssert.assertResultSets;
+import static org.elasticsearch.xpack.sql.jdbc.compare.JdbcAssert.assertResultSets;
 
 /**
  * Compares Elasticsearch's JDBC driver to H2.
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/FilterIT.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/FilterIT.java
similarity index 93%
rename from sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/FilterIT.java
rename to sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/FilterIT.java
index 2c5f93a38e2..e68c5c6bd41 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/FilterIT.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/FilterIT.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.sql.jdbc.query;
+package org.elasticsearch.xpack.sql.jdbc.compare;
 
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/JdbcAssert.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/JdbcAssert.java
similarity index 98%
rename from sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/JdbcAssert.java
rename to sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/JdbcAssert.java
index 0675e503589..9704b336a9d 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/JdbcAssert.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/JdbcAssert.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.sql.jdbc.query;
+package org.elasticsearch.xpack.sql.jdbc.compare;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/SelectIT.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/SelectIT.java
similarity index 93%
rename from sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/SelectIT.java
rename to sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/SelectIT.java
index 263ed1c587c..e1cd9868ef8 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/query/SelectIT.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/SelectIT.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.sql.jdbc.query;
+package org.elasticsearch.xpack.sql.jdbc.compare;
 
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/package-info.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/package-info.java
new file mode 100644
index 00000000000..8f7232a57d7
--- /dev/null
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/compare/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * Tests comparing our jdbc client to H2's jdbc client.
+ */
+package org.elasticsearch.xpack.sql.jdbc.compare;
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/CompareToH2BaseTestCase.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/CompareToH2BaseTestCase.java
index 8052f02d9b7..307860aa389 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/CompareToH2BaseTestCase.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/CompareToH2BaseTestCase.java
@@ -21,7 +21,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import static java.lang.String.format;
-import static org.elasticsearch.xpack.sql.jdbc.query.JdbcAssert.assertResultSets;
+import static org.elasticsearch.xpack.sql.jdbc.compare.JdbcAssert.assertResultSets;
 
 public abstract class CompareToH2BaseTestCase extends ESTestCase {
     // NOCOMMIT subclasses should probably all be integration tests running against a running Elasticsearch
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/QuerySuite.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/QuerySuite.java
index 6b9cee7b9be..ab11e2d52f6 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/QuerySuite.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/query/QuerySuite.java
@@ -11,14 +11,14 @@ import java.util.function.Supplier;
 
 import org.elasticsearch.common.CheckedSupplier;
 import org.elasticsearch.xpack.sql.jdbc.JdbcTemplate;
+import org.elasticsearch.xpack.sql.jdbc.compare.FilterIT;
+import org.elasticsearch.xpack.sql.jdbc.compare.SelectIT;
 import org.elasticsearch.xpack.sql.jdbc.integration.query.function.aggregate.AggSpecTests;
 import org.elasticsearch.xpack.sql.jdbc.integration.query.function.scalar.datetime.DateTimeSpecTests;
 import org.elasticsearch.xpack.sql.jdbc.integration.query.function.scalar.math.MathSpecTests;
 import org.elasticsearch.xpack.sql.jdbc.integration.util.EsDataLoader;
 import org.elasticsearch.xpack.sql.jdbc.integration.util.EsJdbcServer;
 import org.elasticsearch.xpack.sql.jdbc.integration.util.H2;
-import org.elasticsearch.xpack.sql.jdbc.query.FilterIT;
-import org.elasticsearch.xpack.sql.jdbc.query.SelectIT;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/package-info.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/package-info.java
new file mode 100644
index 00000000000..243adcbc769
--- /dev/null
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * Tests for the Elasticsearch jdbc client.
+ */
+package org.elasticsearch.xpack.sql.jdbc;