diff --git a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreTypeMapping.java b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreTypeMapping.java
index 2fefc73603f8..33e435c3b1d3 100644
--- a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreTypeMapping.java
+++ b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreTypeMapping.java
@@ -29,7 +29,6 @@
 import io.trino.testing.sql.SqlExecutor;
 import io.trino.testing.sql.TestTable;
 import io.trino.testing.sql.TrinoSqlExecutor;
-import org.testng.annotations.AfterClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -88,16 +87,10 @@ public class TestSingleStoreTypeMapping
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        singleStoreServer = new TestingSingleStoreServer();
+        singleStoreServer = closeAfterClass(new TestingSingleStoreServer());
         return createSingleStoreQueryRunner(singleStoreServer, ImmutableMap.of(), ImmutableMap.of(), ImmutableList.of());
     }
 
-    @AfterClass(alwaysRun = true)
-    public final void destroy()
-    {
-        singleStoreServer.close();
-    }
-
     @Test
     public void testBit()
     {