diff --git a/pom.xml b/pom.xml
index ebedf7c979a1..2d7aa50b43f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,7 @@
         <module>service/trino-proxy</module>
         <module>service/trino-verifier</module>
         <module>testing/trino-benchmark</module>
+        <module>testing/trino-benchmark-queries</module>
         <module>testing/trino-benchto-benchmarks</module>
         <module>testing/trino-faulttolerant-tests</module>
         <module>testing/trino-plugin-reader</module>
@@ -209,6 +210,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-benchmark-queries</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-benchto-benchmarks</artifactId>
diff --git a/testing/trino-benchmark-queries/pom.xml b/testing/trino-benchmark-queries/pom.xml
new file mode 100644
index 000000000000..6e781fba2471
--- /dev/null
+++ b/testing/trino-benchmark-queries/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>399-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-benchmark-queries</artifactId>
+    <name>trino-benchmark-queries</name>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q01.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q01.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q01.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q01.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q02.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q02.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q02.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q02.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q03.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q03.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q03.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q03.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q04.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q04.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q04.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q04.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q05.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q05.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q05.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q05.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q06.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q06.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q06.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q06.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q07.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q07.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q07.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q07.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q08.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q08.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q08.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q08.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q09.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q09.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q09.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q09.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q10.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q10.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q10.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q10.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q11.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q11.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q11.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q11.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q12.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q12.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q12.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q12.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q13.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q13.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q13.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q13.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q14.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q14.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q14.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q14.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q15.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q15.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q15.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q15.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q16.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q16.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q16.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q16.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q17.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q17.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q17.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q17.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q18.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q18.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q18.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q18.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q19.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q19.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q19.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q19.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q20.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q20.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q20.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q20.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q21.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q21.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q21.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q21.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q22.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q22.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q22.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q22.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q23.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q23.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q23.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q23.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q24.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q24.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q24.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q24.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q25.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q25.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q25.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q25.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q26.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q26.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q26.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q26.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q27.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q27.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q27.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q27.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q28.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q28.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q28.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q28.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q29.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q29.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q29.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q29.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q30.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q30.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q30.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q30.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q31.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q31.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q31.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q31.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q32.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q32.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q32.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q32.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q33.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q33.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q33.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q33.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q34.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q34.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q34.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q34.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q35.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q35.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q35.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q35.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q36.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q36.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q36.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q36.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q37.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q37.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q37.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q37.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q38.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q38.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q38.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q38.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q39.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q39.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q39.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q39.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q40.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q40.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q40.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q40.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q41.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q41.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q41.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q41.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q42.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q42.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q42.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q42.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q43.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q43.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q43.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q43.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q44.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q44.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q44.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q44.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q45.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q45.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q45.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q45.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q46.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q46.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q46.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q46.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q47.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q47.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q47.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q47.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q48.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q48.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q48.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q48.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q49.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q49.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q49.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q49.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q50.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q50.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q50.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q50.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q51.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q51.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q51.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q51.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q52.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q52.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q52.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q52.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q53.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q53.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q53.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q53.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q54.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q54.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q54.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q54.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q55.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q55.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q55.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q55.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q56.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q56.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q56.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q56.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q57.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q57.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q57.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q57.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q58.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q58.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q58.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q58.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q59.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q59.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q59.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q59.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q60.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q60.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q60.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q60.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q61.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q61.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q61.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q61.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q62.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q62.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q62.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q62.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q63.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q63.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q63.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q63.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q64.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q64.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q64.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q64.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q65.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q65.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q65.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q65.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q66.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q66.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q66.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q66.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q67.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q67.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q67.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q67.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q68.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q68.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q68.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q68.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q69.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q69.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q69.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q69.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q70.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q70.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q70.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q70.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q71.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q71.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q71.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q71.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q72.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q72.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q72.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q72.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q73.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q73.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q73.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q73.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q74.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q74.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q74.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q74.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q75.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q75.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q75.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q75.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q76.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q76.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q76.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q76.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q77.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q77.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q77.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q77.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q78.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q78.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q78.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q78.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q79.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q79.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q79.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q79.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q80.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q80.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q80.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q80.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q81.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q81.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q81.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q81.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q82.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q82.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q82.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q82.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q83.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q83.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q83.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q83.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q84.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q84.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q84.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q84.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q85.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q85.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q85.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q85.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q86.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q86.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q86.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q86.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q87.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q87.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q87.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q87.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q88.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q88.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q88.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q88.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q89.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q89.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q89.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q89.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q90.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q90.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q90.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q90.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q91.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q91.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q91.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q91.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q92.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q92.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q92.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q92.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q93.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q93.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q93.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q93.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q94.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q94.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q94.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q94.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q95.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q95.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q95.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q95.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q96.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q96.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q96.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q96.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q97.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q97.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q97.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q97.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q98.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q98.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q98.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q98.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q99.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q99.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpcds/q99.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpcds/q99.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q01.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q01.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q01.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q01.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q02.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q02.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q02.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q02.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q03.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q03.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q03.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q03.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q04.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q04.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q04.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q04.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q05.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q05.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q05.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q05.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q06.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q06.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q06.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q06.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q07.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q07.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q07.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q07.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q08.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q08.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q08.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q08.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q09.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q09.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q09.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q09.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q10.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q10.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q10.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q10.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q11.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q11.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q11.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q11.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q12.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q12.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q12.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q12.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q13.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q13.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q13.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q13.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q14.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q14.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q14.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q14.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q15.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q15.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q15.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q15.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q16.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q16.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q16.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q16.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q17.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q17.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q17.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q17.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q18.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q18.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q18.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q18.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q19.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q19.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q19.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q19.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q20.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q20.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q20.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q20.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q21.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q21.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q21.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q21.sql
diff --git a/testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q22.sql b/testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q22.sql
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/main/resources/sql/presto/tpch/q22.sql
rename to testing/trino-benchmark-queries/src/main/resources/sql/presto/tpch/q22.sql
diff --git a/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java b/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java
new file mode 100644
index 000000000000..7a74cf01fc90
--- /dev/null
+++ b/testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java
@@ -0,0 +1,22 @@
+/*
+ * 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
+ *
+ *     http://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 io.trino.benchmark.queries;
+
+import org.testng.annotations.Test;
+
+public class TestDummy
+{
+    @Test
+    public void buildRequiresTestToExist() {}
+}
diff --git a/testing/trino-benchto-benchmarks/pom.xml b/testing/trino-benchto-benchmarks/pom.xml
index 366fdb2b775c..398ccb480d62 100644
--- a/testing/trino-benchto-benchmarks/pom.xml
+++ b/testing/trino-benchto-benchmarks/pom.xml
@@ -13,82 +13,36 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <air.check.fail-dependency>false</air.check.fail-dependency>
         <air.check.fail-duplicate-finder>false</air.check.fail-duplicate-finder>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino.benchto</groupId>
-            <artifactId>benchto-driver</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
+            <!-- benchmark queries referenced from benchmark definition files -->
             <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
+            <artifactId>trino-benchmark-queries</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
+            <!-- for connecting to Trino when running benchmarks -->
             <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive-hadoop2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>test</scope>
+            <artifactId>trino-jdbc</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
-            <scope>test</scope>
+            <!-- provides the main class -->
+            <groupId>io.trino.benchto</groupId>
+            <artifactId>benchto-driver</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
+            <!-- TODO document why we have explicit dependency on Guava -->
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java b/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java
new file mode 100644
index 000000000000..f91752b76233
--- /dev/null
+++ b/testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java
@@ -0,0 +1,22 @@
+/*
+ * 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
+ *
+ *     http://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 io.trino.benchmarks;
+
+import org.testng.annotations.Test;
+
+public class TestDummy
+{
+    @Test
+    public void buildRequiresTestToExist() {}
+}
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/hive.properties b/testing/trino-benchto-benchmarks/src/test/resources/hive.properties
deleted file mode 100644
index a89b07b9f452..000000000000
--- a/testing/trino-benchto-benchmarks/src/test/resources/hive.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-hive.hdfs.socks-proxy=localhost:1180
-hive.metastore=glue
-hive.metastore.glue.region=us-east-2
-hive.metastore-cache-maximum-size=50000
-hive.metastore-cache-ttl=10000m
diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml
index 16bfe6be53d4..3cb94909ff31 100644
--- a/testing/trino-tests/pom.xml
+++ b/testing/trino-tests/pom.xml
@@ -137,6 +137,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-benchmark-queries</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-blackhole</artifactId>
@@ -155,6 +161,33 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- conflicts with com.google.protobuf:protobuf-java -->
+                    <groupId>org.alluxio</groupId>
+                    <artifactId>alluxio-shaded-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- conflicts with com.google.protobuf:protobuf-java -->
+                    <groupId>org.alluxio</groupId>
+                    <artifactId>alluxio-shaded-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -206,6 +239,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -285,4 +325,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <configuration>
+                    <ignoredResourcePatterns>
+                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
+                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
+                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
+                    </ignoredResourcePatterns>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java
similarity index 98%
rename from testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java
rename to testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java
index 3fa33af72ba9..fc01e08bc691 100644
--- a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java
+++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java
@@ -229,12 +229,12 @@ protected Path getSourcePath()
         verify(isDirectory(workingDir), "Working directory is not a directory");
         String topDirectoryName = workingDir.getFileName().toString();
         switch (topDirectoryName) {
-            case "trino-benchto-benchmarks":
+            case "trino-tests":
                 return workingDir;
             case "trino":
-                return workingDir.resolve("testing/trino-benchto-benchmarks");
+                return workingDir.resolve("testing/trino-tests");
             default:
-                throw new IllegalStateException("This class must be executed from trino-benchto-benchmarks or Trino source directory");
+                throw new IllegalStateException("This class must be executed from trino-tests or Trino source directory");
         }
     }
 
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java
similarity index 96%
rename from testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java
rename to testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java
index 4e2b253f41c0..37951fad1bca 100644
--- a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java
+++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
-import io.trino.plugin.hive.HivePlugin;
+import io.trino.plugin.hive.TestingHivePlugin;
 import io.trino.testing.DistributedQueryRunner;
 
 import java.nio.file.Path;
@@ -77,7 +77,7 @@ private static DistributedQueryRunner createQueryRunner(String schema, String co
         String recordingPath = getResourcePath(format("%s/%s.json.gz", recordingDir, schema));
         Path.of(recordingPath).toFile().getParentFile().mkdirs();
 
-        queryRunner.installPlugin(new HivePlugin());
+        queryRunner.installPlugin(new TestingHivePlugin());
         queryRunner.createCatalog("hive", "hive", configBuilder
                 .putAll(loadPropertiesFrom(configPath))
                 .put("hive.metastore-recording-path", recordingPath)
@@ -88,7 +88,7 @@ private static DistributedQueryRunner createQueryRunner(String schema, String co
 
     private static String getResourcePath(String relativePath)
     {
-        return Path.of("testing/trino-benchto-benchmarks/src/test/resources", relativePath).toString();
+        return Path.of("testing/trino-tests/src/test/resources", relativePath).toString();
     }
 
     @Override
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java
rename to testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java
rename to testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java
rename to testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java
diff --git a/testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java
rename to testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/README.md b/testing/trino-tests/src/test/resources/hive_metadata/README.md
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/README.md
rename to testing/trino-tests/src/test/resources/hive_metadata/README.md
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz
rename to testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpcds/tpcds_sf1000_orc_part.json.gz
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz
rename to testing/trino-tests/src/test/resources/hive_metadata/partitioned_tpch/tpch_sf1000_orc_part.json.gz
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz
rename to testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpcds/tpcds_sf1000_orc.json.gz
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz b/testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz
rename to testing/trino-tests/src/test/resources/hive_metadata/unpartitioned_tpch/tpch_sf1000_orc.json.gz
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q01.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q01.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q01.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q02.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q02.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q02.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q03.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q03.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q03.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q04.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q04.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q04.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q05.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q05.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q05.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q06.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q06.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q06.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q07.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q07.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q07.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q08.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q08.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q08.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q09.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q09.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q09.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q10.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q10.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q10.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q11.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q11.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q11.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q12.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q12.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q12.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q13.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q13.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q13.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q14.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q14.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q14.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q15.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q15.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q15.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q16.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q16.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q16.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q17.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q17.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q17.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q18.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q18.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q18.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q19.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q19.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q19.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q20.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q20.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q20.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q21.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q21.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q21.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q22.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q22.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q22.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q23.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q23.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q23.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q24.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q24.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q24.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q25.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q25.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q25.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q26.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q26.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q26.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q27.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q27.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q27.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q28.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q28.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q28.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q28.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q29.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q29.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q29.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q30.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q30.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q30.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q31.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q31.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q31.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q32.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q32.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q32.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q33.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q33.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q33.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q34.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q34.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q34.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q35.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q35.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q35.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q36.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q36.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q36.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q37.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q37.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q37.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q38.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q38.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q38.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q39.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q39.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q39.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q40.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q40.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q40.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q41.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q41.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q41.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q42.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q42.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q42.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q43.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q43.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q43.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q44.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q44.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q44.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q44.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q45.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q45.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q45.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q46.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q46.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q46.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q47.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q47.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q47.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q48.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q48.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q48.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q49.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q49.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q49.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q50.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q50.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q50.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q51.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q51.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q51.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q52.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q52.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q52.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q53.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q53.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q53.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q54.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q54.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q54.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q55.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q55.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q55.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q56.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q56.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q56.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q57.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q57.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q57.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q58.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q58.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q58.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q59.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q59.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q59.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q60.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q60.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q60.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q61.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q61.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q61.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q62.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q62.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q62.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q63.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q63.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q63.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q64.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q64.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q64.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q65.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q65.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q65.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q66.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q66.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q66.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q67.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q67.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q67.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q68.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q68.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q68.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q69.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q69.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q69.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q70.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q70.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q70.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q71.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q71.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q71.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q72.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q72.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q72.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q73.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q73.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q73.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q74.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q74.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q74.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q75.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q75.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q75.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q76.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q76.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q76.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q77.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q77.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q77.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q78.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q78.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q78.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q79.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q79.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q79.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q80.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q80.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q80.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q81.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q81.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q81.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q82.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q82.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q82.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q83.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q83.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q83.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q84.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q84.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q84.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q85.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q85.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q85.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q86.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q86.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q86.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q87.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q87.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q87.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q88.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q88.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q88.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q89.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q89.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q89.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q90.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q90.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q90.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q91.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q91.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q91.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q92.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q92.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q92.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q93.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q93.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q93.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q94.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q94.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q94.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q95.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q95.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q95.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q96.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q96.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q96.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q97.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q97.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q97.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q98.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q98.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q98.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q99.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/partitioned/q99.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q99.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q01.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q01.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q01.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q02.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q02.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q02.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q03.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q03.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q03.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q04.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q04.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q04.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q05.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q05.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q05.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q06.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q06.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q06.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q07.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q07.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q07.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q08.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q08.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q08.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q09.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q09.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q09.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q10.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q10.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q10.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q11.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q11.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q11.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q12.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q12.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q12.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q13.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q13.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q13.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q14.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q14.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q14.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q15.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q15.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q15.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q16.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q16.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q16.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q17.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q17.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q17.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q18.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q18.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q18.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q19.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q19.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q19.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q20.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q20.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q20.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q21.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q21.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q21.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q22.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q22.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q22.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q23.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q23.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q23.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q24.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q24.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q24.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q25.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q25.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q25.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q26.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q26.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q26.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q27.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q27.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q27.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q28.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q28.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q28.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q28.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q29.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q29.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q29.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q30.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q30.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q30.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q31.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q31.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q31.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q32.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q32.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q32.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q33.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q33.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q33.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q34.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q34.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q34.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q35.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q35.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q35.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q36.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q36.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q36.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q37.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q37.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q37.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q38.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q38.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q38.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q39.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q39.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q39.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q40.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q40.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q40.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q41.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q41.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q41.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q42.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q42.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q42.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q43.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q43.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q43.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q44.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q44.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q44.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q44.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q45.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q45.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q45.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q46.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q46.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q46.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q47.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q47.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q47.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q48.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q48.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q48.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q49.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q49.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q49.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q50.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q50.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q50.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q51.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q51.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q51.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q52.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q52.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q52.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q53.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q53.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q53.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q54.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q54.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q54.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q55.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q55.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q55.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q56.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q56.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q56.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q57.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q57.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q57.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q58.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q58.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q58.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q59.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q59.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q59.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q60.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q60.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q60.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q61.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q61.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q61.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q62.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q62.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q62.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q63.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q63.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q63.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q64.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q64.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q64.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q65.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q65.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q65.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q66.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q66.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q66.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q67.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q67.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q67.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q68.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q68.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q68.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q69.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q69.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q69.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q70.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q70.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q70.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q71.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q71.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q71.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q72.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q72.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q72.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q73.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q73.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q73.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q74.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q74.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q74.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q75.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q75.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q75.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q76.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q76.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q76.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q77.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q77.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q77.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q78.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q78.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q78.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q79.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q79.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q79.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q80.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q80.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q80.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q81.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q81.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q81.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q82.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q82.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q82.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q83.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q83.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q83.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q84.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q84.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q84.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q85.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q85.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q85.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q86.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q86.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q86.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q87.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q87.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q87.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q88.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q88.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q88.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q89.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q89.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q89.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q90.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q90.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q90.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q91.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q91.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q91.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q92.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q92.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q92.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q93.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q93.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q93.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q94.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q94.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q94.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q95.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q95.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q95.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q96.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q96.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q96.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q97.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q97.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q97.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q98.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q98.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q98.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q99.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpcds/unpartitioned/q99.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q99.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q01.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q01.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q01.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q02.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q02.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q02.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q03.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q03.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q03.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q04.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q04.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q04.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q05.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q05.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q05.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q06.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q06.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q06.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q07.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q07.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q07.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q08.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q08.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q08.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q09.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q09.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q09.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q10.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q10.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q10.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q11.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q11.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q11.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q12.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q12.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q12.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q13.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q13.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q13.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q14.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q14.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q14.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q15.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q15.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q15.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q16.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q16.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q16.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q17.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q17.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q17.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q18.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q18.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q18.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q19.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q19.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q19.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q20.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q20.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q20.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q21.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q21.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q21.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q22.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/partitioned/q22.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q22.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q01.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q01.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q01.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q02.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q02.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q02.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q03.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q03.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q03.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q04.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q04.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q04.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q05.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q05.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q05.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q06.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q06.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q06.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q07.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q07.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q07.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q08.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q08.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q08.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q09.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q09.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q09.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q10.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q10.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q10.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q11.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q11.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q11.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q12.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q12.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q12.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q13.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q13.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q13.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q14.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q14.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q14.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q15.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q15.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q15.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q16.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q16.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q16.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q17.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q17.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q17.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q18.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q18.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q18.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q19.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q19.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q19.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q20.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q20.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q20.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q21.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q21.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q21.plan.txt
diff --git a/testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q22.plan.txt
similarity index 100%
rename from testing/trino-benchto-benchmarks/src/test/resources/sql/presto/tpch/unpartitioned/q22.plan.txt
rename to testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q22.plan.txt