diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java
index 25d7e05649c4..4152540e52e9 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java
@@ -26,6 +26,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.hadoop.io.Text;
 import org.intellij.lang.annotations.Language;
 
@@ -86,7 +87,9 @@ private static synchronized QueryRunner createAccumuloQueryRunner(Map<String, St
         if (!tpchLoaded) {
             queryRunner.execute("CREATE SCHEMA accumulo.tpch");
             copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, createSession(), TpchTable.getTables());
-            server.getClient().tableOperations().addSplits("tpch.orders", ImmutableSortedSet.of(new Text(new LexicoderRowSerializer().encode(BIGINT, 7500L))));
+            try (AccumuloClient client = server.createClient()) {
+                client.tableOperations().addSplits("tpch.orders", ImmutableSortedSet.of(new Text(new LexicoderRowSerializer().encode(BIGINT, 7500L))));
+            }
             tpchLoaded = true;
         }
 
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloMetadataManager.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloMetadataManager.java
index db8783da67f5..301b462748dd 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloMetadataManager.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloMetadataManager.java
@@ -41,6 +41,7 @@
 @TestInstance(PER_CLASS)
 public class TestAccumuloMetadataManager
 {
+    private AccumuloClient client;
     private AccumuloMetadataManager metadataManager;
     private ZooKeeperMetadataManager zooKeeperMetadataManager;
 
@@ -54,7 +55,7 @@ public void setUp()
                 .setInstance(server.getInstanceName())
                 .setUsername("root")
                 .setPassword("secret");
-        AccumuloClient client = server.getClient();
+        client = server.createClient();
         zooKeeperMetadataManager = new ZooKeeperMetadataManager(config, TESTING_TYPE_MANAGER);
         metadataManager = new AccumuloMetadataManager(client, config, zooKeeperMetadataManager, new AccumuloTableManager(client), new IndexLookup(client, new ColumnCardinalityCache(client, config)));
     }
@@ -65,6 +66,8 @@ public void tearDown()
         zooKeeperMetadataManager.close();
         zooKeeperMetadataManager = null;
         metadataManager = null;
+        client.close();
+        client = null;
     }
 
     @Test
diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestingAccumuloServer.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestingAccumuloServer.java
index afdd27a6da1e..f9b32de3c49d 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestingAccumuloServer.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestingAccumuloServer.java
@@ -86,7 +86,7 @@ public String getPassword()
         return "secret";
     }
 
-    public AccumuloClient getClient()
+    public AccumuloClient createClient()
     {
         return Accumulo.newClient().to(getInstanceName(), getZooKeepers())
                 .as(getUser(), getPassword())