diff --git a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/SybaseQueryRunner.java b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/SybaseQueryRunner.java
index fc6fb0b6a763..143fe2233d83 100644
--- a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/SybaseQueryRunner.java
+++ b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/SybaseQueryRunner.java
@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.sybase;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;
@@ -28,13 +29,15 @@
 import static io.trino.plugin.sybase.SybaseDataLoader.copyTpchTables;
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static io.trino.tpch.TpchTable.CUSTOMER;
+import static io.trino.tpch.TpchTable.NATION;
+import static io.trino.tpch.TpchTable.ORDERS;
+import static io.trino.tpch.TpchTable.REGION;
 
 public class SybaseQueryRunner
 {
     private SybaseQueryRunner() {}
 
-    private static final String TPCH_SCHEMA = "tpch";
-
     public static DistributedQueryRunner createSybaseQueryRunner(TestingSybaseServer server,
             Map<String, String> extraProperties,
             Map<String, String> connectorProperties,
@@ -82,9 +85,9 @@ public static void main(String[] args)
 
         DistributedQueryRunner queryRunner = createSybaseQueryRunner(
                 new TestingSybaseServer(),
-                ImmutableMap.of("http-server.http.port", "8080"),
                 ImmutableMap.of(),
-                TpchTable.getTables());
+                ImmutableMap.of(),
+                ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION));
 
         Logger log = Logger.get(SybaseQueryRunner.class);
         log.info("======== SERVER STARTED ========");
diff --git a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestingSybaseServer.java b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestingSybaseServer.java
index abf230c9e732..84097e89b403 100644
--- a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestingSybaseServer.java
+++ b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestingSybaseServer.java
@@ -18,7 +18,6 @@
 
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;