diff --git a/testing/trino-tests/src/test/java/io/trino/tests/AbstractDistributedEngineOnlyQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
similarity index 99%
rename from testing/trino-tests/src/test/java/io/trino/tests/AbstractDistributedEngineOnlyQueries.java
rename to testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
index 4866d1a2470b..7efef1abc62d 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/AbstractDistributedEngineOnlyQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.tests;
+package io.trino.testing;
 
 import io.trino.Session;
 import org.intellij.lang.annotations.Language;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/AbstractTestEngineOnlyQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
similarity index 99%
rename from testing/trino-tests/src/test/java/io/trino/tests/AbstractTestEngineOnlyQueries.java
rename to testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
index 28576f115e7b..28c960a88007 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/AbstractTestEngineOnlyQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestEngineOnlyQueries.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.tests;
+package io.trino.testing;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ArrayListMultimap;
@@ -27,10 +27,8 @@
 import io.trino.SystemSessionProperties;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.TimeZoneKey;
-import io.trino.testing.AbstractTestQueryFramework;
-import io.trino.testing.MaterializedResult;
-import io.trino.testing.MaterializedRow;
 import io.trino.testing.assertions.Assert;
+import io.trino.tests.QueryTemplate;
 import io.trino.tpch.TpchTable;
 import io.trino.type.SqlIntervalDayTime;
 import io.trino.type.SqlIntervalYearMonth;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedEngineOnlyQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedEngineOnlyQueries.java
index 3e1ea3fb521b..8cef935e1db4 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedEngineOnlyQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestDistributedEngineOnlyQueries.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.connector.MockConnectorFactory;
 import io.trino.connector.MockConnectorPlugin;
+import io.trino.testing.AbstractDistributedEngineOnlyQueries;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestLocalEngineOnlyQueries.java b/testing/trino-tests/src/test/java/io/trino/tests/TestLocalEngineOnlyQueries.java
index 6cb647b91ac1..e33cea6524eb 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestLocalEngineOnlyQueries.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestLocalEngineOnlyQueries.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.connector.MockConnectorFactory;
+import io.trino.testing.AbstractTestEngineOnlyQueries;
 import io.trino.testing.LocalQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.testng.SkipException;