diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
index 3df1a2c8e71e..13f34dc51f72 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
@@ -60,7 +60,6 @@
 import static io.trino.spi.session.PropertyMetadata.stringProperty;
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.type.IntegerType.INTEGER;
-import static io.trino.testing.TestingConnectorSession.builder;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
@@ -870,7 +869,7 @@ private JdbcColumnHandle addColumn(JdbcClient client, JdbcTableHandle tableHandl
 
     private static ConnectorSession createSession(String sessionName)
     {
-        return builder()
+        return TestingConnectorSession.builder()
                 .setPropertyMetadata(PROPERTY_METADATA)
                 .setPropertyValues(ImmutableMap.of("session_name", sessionName))
                 .build();
@@ -878,7 +877,7 @@ private static ConnectorSession createSession(String sessionName)
 
     private static ConnectorSession createUserSession(String userName)
     {
-        return builder()
+        return TestingConnectorSession.builder()
                 .setIdentity(ConnectorIdentity.forUser(userName)
                         .withExtraCredentials(ImmutableMap.of("user", userName))
                         .build())
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java
index 60dc293605e6..8c04657b9830 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/InMemoryThriftMetastore.java
@@ -58,7 +58,6 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.ImmutableList.builder;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.io.MoreFiles.deleteRecursively;
@@ -236,7 +235,7 @@ public synchronized void dropTable(String databaseName, String tableName, boolea
 
     private static List<String> listAllDataPaths(ThriftMetastore metastore, String schemaName, String tableName)
     {
-        ImmutableList.Builder<String> locations = builder();
+        ImmutableList.Builder<String> locations = ImmutableList.builder();
         Table table = metastore.getTable(schemaName, tableName).get();
         if (table.getSd().getLocation() != null) {
             // For unpartitioned table, there should be nothing directly under this directory.
@@ -413,7 +412,7 @@ private static boolean partitionMatches(Partition partition, String databaseName
     @Override
     public synchronized List<Partition> getPartitionsByNames(String databaseName, String tableName, List<String> partitionNames)
     {
-        ImmutableList.Builder<Partition> builder = builder();
+        ImmutableList.Builder<Partition> builder = ImmutableList.builder();
         for (String name : partitionNames) {
             PartitionName partitionName = PartitionName.partition(databaseName, tableName, name);
             Partition partition = partitions.get(partitionName);
diff --git a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java
index 95d4b6e01549..f9cb8d117318 100644
--- a/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java
+++ b/plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/S3HudiQueryRunner.java
@@ -44,7 +44,6 @@
 
 import static io.trino.plugin.hive.HiveTestUtils.SOCKS_PROXY;
 import static io.trino.plugin.hive.TestingThriftHiveMetastoreBuilder.testingThriftHiveMetastoreBuilder;
-import static io.trino.testing.DistributedQueryRunner.builder;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
@@ -86,7 +85,7 @@ public static DistributedQueryRunner create(
             // do nothing if database already exists
         }
 
-        DistributedQueryRunner queryRunner = builder(createSession())
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(createSession())
                 .setExtraProperties(extraProperties)
                 .build();
         queryRunner.installPlugin(new TestingHudiPlugin(Optional.of(metastore)));