diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcIntegrationTestCase.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcIntegrationTestCase.java
index a3f3d0936a4..e2e7e7059cc 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcIntegrationTestCase.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcIntegrationTestCase.java
@@ -12,7 +12,6 @@ import org.elasticsearch.common.CheckedConsumer;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.test.rest.ESRestTestCase;
-import org.elasticsearch.xpack.sql.jdbc.integration.util.JdbcTemplate;
 import org.elasticsearch.xpack.sql.jdbc.jdbc.JdbcDriver;
 import org.junit.Before;
 
diff --git a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/util/JdbcTemplate.java b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcTemplate.java
similarity index 99%
rename from sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/util/JdbcTemplate.java
rename to sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcTemplate.java
index 62701fc9a5f..9da6301b51b 100644
--- a/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/integration/util/JdbcTemplate.java
+++ b/sql-clients/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcTemplate.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.integration.util;
+package org.elasticsearch.xpack.sql.jdbc;
 
 import org.elasticsearch.common.CheckedConsumer;
 import org.elasticsearch.common.CheckedFunction;
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 30467bf91ea..6b9cee7b9be 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
@@ -10,13 +10,13 @@ import java.sql.SQLException;
 import java.util.function.Supplier;
 
 import org.elasticsearch.common.CheckedSupplier;
+import org.elasticsearch.xpack.sql.jdbc.JdbcTemplate;
 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.integration.util.JdbcTemplate;
 import org.elasticsearch.xpack.sql.jdbc.query.FilterIT;
 import org.elasticsearch.xpack.sql.jdbc.query.SelectIT;
 import org.junit.BeforeClass;