diff --git a/tests/PolykeyClient.test.ts b/tests/PolykeyClient.test.ts
index 343f97568..a6f25c234 100644
--- a/tests/PolykeyClient.test.ts
+++ b/tests/PolykeyClient.test.ts
@@ -7,7 +7,7 @@ import { PolykeyClient, PolykeyAgent } from '@';
 import { Session } from '@/sessions';
 import config from '@/config';
 import * as keysUtils from '@/keys/utils/index';
-import WebSocketClient from '@/websockets/WebSocketClient';
+import { WebSocketClient } from '@matrixai/ws';
 
 describe('PolykeyClient', () => {
   const password = 'password';
@@ -54,13 +54,15 @@ describe('PolykeyClient', () => {
     await session.writeToken('dummy' as SessionToken);
     // Using fresh: true means that any token would be destroyed
     const webSocketClient = await WebSocketClient.createWebSocketClient({
-      expectedNodeIds: [pkAgent.keyRing.getNodeId()],
+      config: {
+        verifyPeer: false,
+      },
       host: pkAgent.clientServiceHost,
       port: pkAgent.clientServicePort,
       logger,
     });
     const pkClient = await PolykeyClient.createPolykeyClient({
-      streamFactory: (ctx) => webSocketClient.startConnection(ctx),
+      streamFactory: () => webSocketClient.connection.newStream(),
       nodePath,
       fs,
       logger,
@@ -72,6 +74,6 @@ describe('PolykeyClient', () => {
     expect(await session.readToken()).toBeDefined();
     await pkClient.destroy();
     expect(await session.readToken()).toBeUndefined();
-    await webSocketClient.destroy(true);
+    await webSocketClient.destroy({ force: true });
   });
 });
diff --git a/tests/nodes/agent/handlers/nodesClaimsGet.test.ts b/tests/nodes/agent/handlers/nodesClaimsGet.test.ts
index cc016208d..b3d532803 100644
--- a/tests/nodes/agent/handlers/nodesClaimsGet.test.ts
+++ b/tests/nodes/agent/handlers/nodesClaimsGet.test.ts
@@ -141,7 +141,7 @@ describe('nodesClaimsGet', () => {
     });
 
     // Setting up client
-    rpcClient = await RPCClient.createRPCClient({
+    rpcClient = new RPCClient({
       manifest: clientManifest,
       streamFactory: async () => {
         return quicClient.connection.newStream();
@@ -162,7 +162,7 @@ describe('nodesClaimsGet', () => {
     });
   });
   afterEach(async () => {
-    await rpcServer.destroy({ force: true });
+    await rpcServer.stop({ force: true });
     await quicServer.stop({ force: true });
     await sigchain.stop();
     await db.stop();
diff --git a/tests/nodes/agent/handlers/nodesClosestLocalNode.test.ts b/tests/nodes/agent/handlers/nodesClosestLocalNode.test.ts
index aa4c3b922..8faa92ee2 100644
--- a/tests/nodes/agent/handlers/nodesClosestLocalNode.test.ts
+++ b/tests/nodes/agent/handlers/nodesClosestLocalNode.test.ts
@@ -75,10 +75,10 @@ describe('nodesClosestLocalNode', () => {
         nodeGraph,
       }),
     };
-    rpcServer = await RPCServer.createRPCServer({
-      manifest: serverManifest,
+    rpcServer = new RPCServer({
       logger,
     });
+    await rpcServer.start({ manifest: serverManifest });
     const tlsConfig = await tlsTestsUtils.createTLSConfig(keyRing.keyPair);
     quicServer = new QUICServer({
       config: {
@@ -140,7 +140,7 @@ describe('nodesClosestLocalNode', () => {
     });
 
     // Setting up client
-    rpcClient = await RPCClient.createRPCClient({
+    rpcClient = new RPCClient({
       manifest: clientManifest,
       streamFactory: async () => {
         return quicClient.connection.newStream();
@@ -161,7 +161,7 @@ describe('nodesClosestLocalNode', () => {
     });
   });
   afterEach(async () => {
-    await rpcServer.destroy({ force: true });
+    await rpcServer.stop({ force: true });
     await quicServer.stop({ force: true });
     await nodeGraph.stop();
     await db.stop();
diff --git a/tests/nodes/agent/handlers/nodesCrossSignClaim.test.ts b/tests/nodes/agent/handlers/nodesCrossSignClaim.test.ts
index d15003009..12287c724 100644
--- a/tests/nodes/agent/handlers/nodesCrossSignClaim.test.ts
+++ b/tests/nodes/agent/handlers/nodesCrossSignClaim.test.ts
@@ -122,10 +122,10 @@ describe('nodesCrossSignClaim', () => {
         nodeManager,
       }),
     };
-    rpcServer = await RPCServer.createRPCServer({
-      manifest: serverManifest,
+    rpcServer = new RPCServer({
       logger,
     });
+    await rpcServer.start({ manifest: serverManifest });
     const tlsConfigServer = await tlsTestsUtils.createTLSConfig(
       keyRing.keyPair,
     );
@@ -192,7 +192,7 @@ describe('nodesCrossSignClaim', () => {
     });
 
     // Setting up client
-    rpcClient = await RPCClient.createRPCClient({
+    rpcClient = new RPCClient({
       manifest: clientManifest,
       streamFactory: async () => {
         return quicClient.connection.newStream();
@@ -222,7 +222,7 @@ describe('nodesCrossSignClaim', () => {
   });
   afterEach(async () => {
     await taskManager.stop();
-    await rpcServer.destroy({ force: true });
+    await rpcServer.stop({ force: true });
     await quicServer.stop({ force: true });
     await nodeGraph.stop();
     await sigchain.stop();
diff --git a/tests/nodes/agent/handlers/nodesHolePunchMessage.test.ts b/tests/nodes/agent/handlers/nodesHolePunchMessage.test.ts
index 4dbe89089..894d1d124 100644
--- a/tests/nodes/agent/handlers/nodesHolePunchMessage.test.ts
+++ b/tests/nodes/agent/handlers/nodesHolePunchMessage.test.ts
@@ -144,10 +144,10 @@ describe('nodesHolePunchMessage', () => {
         logger,
       }),
     };
-    rpcServer = await RPCServer.createRPCServer({
-      manifest: serverManifest,
+    rpcServer = new RPCServer({
       logger,
     });
+    await rpcServer.start({ manifest: serverManifest });
     const tlsConfig = await tlsTestsUtils.createTLSConfig(keyRing.keyPair);
     quicServer = new QUICServer({
       config: {
@@ -206,7 +206,7 @@ describe('nodesHolePunchMessage', () => {
     });
 
     // Setting up client
-    rpcClient = await RPCClient.createRPCClient({
+    rpcClient = new RPCClient({
       manifest: clientManifest,
       streamFactory: async () => {
         return quicClient.connection.newStream();
@@ -232,7 +232,7 @@ describe('nodesHolePunchMessage', () => {
     });
   });
   afterEach(async () => {
-    await rpcServer.destroy({ force: true });
+    await rpcServer.stop({ force: true });
     await taskManager.stopProcessing();
     await taskManager.stopTasks();
     await quicServer.stop({ force: true });
diff --git a/tests/nodes/agent/handlers/notificationsSend.test.ts b/tests/nodes/agent/handlers/notificationsSend.test.ts
index 3a76c3444..31869c9b2 100644
--- a/tests/nodes/agent/handlers/notificationsSend.test.ts
+++ b/tests/nodes/agent/handlers/notificationsSend.test.ts
@@ -164,10 +164,10 @@ describe('notificationsSend', () => {
         notificationsManager,
       }),
     };
-    rpcServer = await RPCServer.createRPCServer({
-      manifest: serverManifest,
+    rpcServer = new RPCServer({
       logger,
     });
+    await rpcServer.start({ manifest: serverManifest });
     const tlsConfig = await tlsTestsUtils.createTLSConfig(keyRing.keyPair);
     quicServer = new QUICServer({
       config: {
@@ -232,7 +232,7 @@ describe('notificationsSend', () => {
     });
 
     // Setting up client
-    rpcClient = await RPCClient.createRPCClient({
+    rpcClient = new RPCClient({
       manifest: clientManifest,
       streamFactory: async () => {
         return quicClient.connection.newStream();
@@ -260,7 +260,7 @@ describe('notificationsSend', () => {
   afterEach(async () => {
     await taskManager.stopProcessing();
     await taskManager.stopTasks();
-    await rpcServer.destroy({ force: true });
+    await rpcServer.stop({ force: true });
     await quicServer.stop({ force: true });
     await notificationsManager.stop();
     await nodeManager.stop();