2 files changed, 9 insertions, 8 deletions
diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
index 2441ea6eaa0..ed4911175a0 100644
--- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
@@ -15,7 +15,7 @@ struct Rpc : FRT_Invokable {
     FNET_Transport    transport;
     FRT_Supervisor    orb;
     Rpc(CryptoEngine::SP crypto, size_t num_threads)
-        : thread_pool(128 * 1024), transport(crypto, num_threads), orb(&transport, &thread_pool) {}
+        : thread_pool(128 * 1024), transport(crypto, num_threads), orb(&transport) {}
     void start() {
         ASSERT_TRUE(transport.Start(&thread_pool));
     }
diff --git a/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp b/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp
index 0e5f4712e61..cdb2636a8c1 100644
--- a/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp
@@ -21,18 +21,19 @@ CryptoEngine::SP tls_crypto = std::make_shared<vespalib::TlsCryptoEngine>(vespal
 TT_Tag req_tag("request");
 
 struct Fixture : FRT_Invokable {
-    FRT_Supervisor orb;
-    Fixture(CryptoEngine::SP crypto) : orb(std::move(crypto)) {
-        ASSERT_TRUE(orb.Listen(0));
+    fnet::frt::StandaloneFRT server;
+    FRT_Supervisor & orb;
+    Fixture(CryptoEngine::SP crypto)
+        : server(std::move(crypto)),
+          orb(server.supervisor())
+    {
+         ASSERT_TRUE(orb.Listen(0));
         init_rpc();
-        ASSERT_TRUE(orb.Start());
     }
     FRT_Target *connect() {
         return orb.GetTarget(orb.GetListenPort());
     }
-    ~Fixture() {
-        orb.ShutDown(true);
-    }
+    ~Fixture() = default;
     void init_rpc() {
         FRT_ReflectionBuilder rb(&orb);
         rb.DefineMethod("inc", "l", "l", FRT_METHOD(Fixture::rpc_inc), this);