diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index 5fc290eda58..de55fe301be 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -592,7 +592,12 @@ class ValidatorSite_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE_PRIO(ValidatorSite, app, xrpl, 2);
+// Quick hack for TrustedPublisherServer definition so I don't have to
+// make a cpp file
+// static
+std::atomic<int> TrustedPublisherServer::counter = 0;
+
+BEAST_DEFINE_TESTSUITE_PRIO(ValidatorSite, app, xrpl, 5);
 
 }  // namespace test
 }  // namespace xrpl
diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h
index 529383c6223..70f9c5dead5 100644
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -127,6 +127,9 @@ class TrustedPublisherServer : public std::enable_shared_from_this<TrustedPublis
             makeManifestString(masterPublic, secret, signingKeys.first, signingKeys.second, 1)};
     }
 
+    static std::atomic<int> counter;
+    int const myNumber;
+
     // TrustedPublisherServer must be accessed through a shared_ptr.
     // This constructor is only public so std::make_shared has access.
     // The function`make_TrustedPublisherServer` should be used to create
@@ -150,7 +153,9 @@ class TrustedPublisherServer : public std::enable_shared_from_this<TrustedPublis
         , useSSL_{useSSL}
         , publisherSecret_{randomSecretKey()}
         , publisherPublic_{derivePublicKey(KeyType::ed25519, publisherSecret_)}
+        , myNumber(++counter)
     {
+        std::cerr << "Creating TrustedPublisherServer #" << myNumber << std::endl;
         auto const keys = randomKeyPair(KeyType::secp256k1);
         auto const manifest =
             makeManifestString(publisherPublic_, publisherSecret_, keys.first, keys.second, 1);
@@ -256,6 +261,8 @@ class TrustedPublisherServer : public std::enable_shared_from_this<TrustedPublis
     ~TrustedPublisherServer()
     {
         stop();
+        std::cerr << "Destructing TrustedPublisherServer #" << myNumber << std::endl;
+        --counter;
     }
 
     endpoint_type
diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp
index e31e687c3d6..83d1fdab77a 100644
--- a/src/test/jtx/impl/envconfig.cpp
+++ b/src/test/jtx/impl/envconfig.cpp
@@ -73,8 +73,8 @@ secure_gateway(std::unique_ptr<Config> cfg)
 std::unique_ptr<Config>
 admin_localnet(std::unique_ptr<Config> cfg)
 {
-    (*cfg)[PORT_RPC].set("admin", "127.0.0.0/8");
-    (*cfg)[PORT_WS].set("admin", "127.0.0.0/8");
+    (*cfg)[PORT_RPC].set("admin", "127.0.0.0/8,[::1]");
+    (*cfg)[PORT_WS].set("admin", "127.0.0.0/8,[::1]");
     return cfg;
 }
 
@@ -83,8 +83,8 @@ secure_gateway_localnet(std::unique_ptr<Config> cfg)
 {
     (*cfg)[PORT_RPC].set("admin", "");
     (*cfg)[PORT_WS].set("admin", "");
-    (*cfg)[PORT_RPC].set("secure_gateway", "127.0.0.0/8");
-    (*cfg)[PORT_WS].set("secure_gateway", "127.0.0.0/8");
+    (*cfg)[PORT_RPC].set("secure_gateway", "127.0.0.0/8,[::1]");
+    (*cfg)[PORT_WS].set("secure_gateway", "127.0.0.0/8,[::1]");
     return cfg;
 }
 std::unique_ptr<Config>