diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
index eba37867c6b3..5d96a15d8332 100644
--- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
+++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
@@ -24,6 +24,8 @@
 import io.trino.spi.connector.ConnectorTableMetadata;
 import io.trino.spi.connector.SchemaTableName;
 import org.apache.accumulo.core.client.Connector;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;
@@ -36,10 +38,11 @@
 
 public class TestAccumuloClient
 {
-    private final AccumuloClient client;
-    private final ZooKeeperMetadataManager zooKeeperMetadataManager;
+    private AccumuloClient client;
+    private ZooKeeperMetadataManager zooKeeperMetadataManager;
 
-    public TestAccumuloClient()
+    @BeforeClass
+    public void setUp()
             throws Exception
     {
         AccumuloConfig config = new AccumuloConfig()
@@ -52,6 +55,13 @@ public TestAccumuloClient()
         client = new AccumuloClient(connector, config, zooKeeperMetadataManager, new AccumuloTableManager(connector), new IndexLookup(connector, new ColumnCardinalityCache(connector, config)));
     }
 
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        zooKeeperMetadataManager = null;
+        client = null;
+    }
+
     @Test
     public void testCreateTableEmptyAccumuloColumn()
     {