diff --git a/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java b/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java
index de3e44fe3..4495795a6 100644
--- a/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java
+++ b/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java
@@ -97,7 +97,6 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
         new PostgreSQLContainer(NomulusPostgreSql.getDockerTag())
             .withDatabaseName(MANAGEMENT_DB_NAME);
     container.start();
-    Runtime.getRuntime().addShutdownHook(new Thread(() -> container.close()));
     return container;
   }
 
diff --git a/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java b/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java
index 0df6b1a0e..96ded68d1 100644
--- a/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java
+++ b/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java
@@ -52,7 +52,8 @@ class DockerWebDriverRule extends ExternalResource {
       url =
           new URL(
               String.format(
-                  "http://localhost:%d/wd/hub",
+                  "http://%s:%d/wd/hub",
+                  container.getContainerIpAddress(),
                   container.getMappedPort(CHROME_DRIVER_SERVICE_PORT)));
     } catch (MalformedURLException e) {
       throw new IllegalArgumentException(e);