diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java
index b1b15f4960..8f6d173a6e 100644
--- a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java
+++ b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java
@@ -71,7 +71,6 @@ public abstract class DistributedTransactionAdminIntegrationTestBase {
           .build();
   protected TransactionFactory transactionFactory;
   protected DistributedTransactionAdmin admin;
-  protected DistributedStorageAdmin storageAdmin;
   protected String systemNamespaceName;
   protected String namespace1;
   protected String namespace2;
@@ -84,7 +83,6 @@ public void beforeAll() throws Exception {
     Properties properties = getProperties(testName);
     transactionFactory = TransactionFactory.create(properties);
     admin = transactionFactory.getTransactionAdmin();
-    storageAdmin = StorageFactory.create(properties).getStorageAdmin();
     systemNamespaceName = getSystemNamespaceName(properties);
     namespace1 = getNamespaceBaseName() + testName + "1";
     namespace2 = getNamespaceBaseName() + testName + "2";
@@ -135,14 +133,6 @@ public void afterAll() throws Exception {
       logger.warn("Failed to drop tables", e);
     }
 
-    try {
-      if (storageAdmin != null) {
-        storageAdmin.close();
-      }
-    } catch (Exception e) {
-      logger.warn("Failed to close storage admin", e);
-    }
-
     try {
       if (admin != null) {
         admin.close();
@@ -791,10 +781,14 @@ protected void extraCheckOnCoordinatorTable() throws ExecutionException {
     } else {
       expectedMetadata = Coordinator.TABLE_METADATA_WITH_GROUP_COMMIT_DISABLED;
     }
-    assertThat(
-            storageAdmin.getTableMetadata(
-                getCoordinatorNamespaceName(getTestName()), Coordinator.TABLE))
-        .isEqualTo(expectedMetadata);
+
+    try (DistributedStorageAdmin storageAdmin =
+        StorageFactory.create(getProperties(getTestName())).getStorageAdmin()) {
+      assertThat(
+              storageAdmin.getTableMetadata(
+                  getCoordinatorNamespaceName(getTestName()), Coordinator.TABLE))
+          .isEqualTo(expectedMetadata);
+    }
   }
 
   @Test