diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java
index 8cc452d7a..5f52ba687 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java
@@ -141,7 +141,9 @@ public class DynamoDbExtension implements BeforeAllCallback, BeforeEachCallback,
     if (endpointOverride == null) {
       dynamoDbContainer.start();
     }
-    initializeClient();
+    if (dynamoDbAsync == null || dynamoDb == null) {
+      initializeClient();
+    }
   }
 
   private void stopServer() {