diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisClusterExtension.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisClusterExtension.java
index ba4a49cb8..534d7381b 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisClusterExtension.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisClusterExtension.java
@@ -202,7 +202,6 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
     final int maxIterations = 11_000;
     for (int i = 0; i < maxIterations; i++) {
       try (final ServerSocket socket = new ServerSocket(0)) {
-        socket.setReuseAddress(false);
         final int port = socket.getLocalPort();
         if (port < 55535) {
           return port;
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisServerExtension.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisServerExtension.java
index 851fe11b5..ff6387951 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisServerExtension.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisServerExtension.java
@@ -93,7 +93,6 @@ public class RedisServerExtension implements BeforeAllCallback, BeforeEachCallba
 
   private static int getAvailablePort() throws IOException {
     try (ServerSocket socket = new ServerSocket(0)) {
-      socket.setReuseAddress(false);
       return socket.getLocalPort();
     }
   }
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 eb658ec96..42c3c88f1 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java
@@ -144,14 +144,10 @@ public class DynamoDbExtension implements BeforeEachCallback, AfterEachCallback
   }
 
   private void startServer() throws Exception {
-    // Even though we're using AWS SDK v2, Dynamo's local implementation's canonical location
-    // is within v1 (https://github.com/aws/aws-sdk-java-v2/issues/982).  This does support
-    // v2 clients, though.
     loadLibrary();
-    ServerSocket serverSocket = new ServerSocket(0);
-    serverSocket.setReuseAddress(false);
-    port = serverSocket.getLocalPort();
-    serverSocket.close();
+    try (ServerSocket serverSocket = new ServerSocket(0)) {
+      port = serverSocket.getLocalPort();
+    }
     server = ServerRunner.createServerFromCommandLineArgs(new String[]{"-inMemory", "-port", String.valueOf(port)});
     server.start();
   }