diff --git a/src/__tests__/utils/tservers.ts b/src/__tests__/utils/tservers.ts
index eadb2c46..88a9c1e8 100644
--- a/src/__tests__/utils/tservers.ts
+++ b/src/__tests__/utils/tservers.ts
@@ -218,7 +218,6 @@ export async function startWSTServer(
   const pendingClients: TServerClient[] = [];
   wsServer.on('connection', (client) => {
     pendingClients.push(toClient(client));
-    setTimeout(() => emitter.emit('client'), 0);
     client.once('close', () => {
       pendingCloses++;
       emitter.emit('close');
@@ -254,10 +253,10 @@ export async function startWSTServer(
           resolve();
         }
         if (pendingClients.length > 0) return done();
-        emitter.once('client', done);
+        wsServer.once('connection', done);
         if (expire)
           setTimeout(() => {
-            emitter.off('client', done); // expired
+            wsServer.off('connection', done); // expired
             resolve();
           }, expire);
       });
@@ -507,7 +506,6 @@ export async function startFastifyWSTServer(
     fastify.get(path, { websocket: true }, (connection, request) => {
       sockets.add(connection.socket);
       pendingClients.push(toClient(connection.socket));
-      setTimeout(() => emitter.emit('client'), 0);
       connection.socket.once('close', () => {
         sockets.delete(connection.socket);
         pendingCloses++;
@@ -586,10 +584,10 @@ export async function startFastifyWSTServer(
           resolve();
         }
         if (pendingClients.length > 0) return done();
-        emitter.once('client', done);
+        fastify.websocketServer.once('connection', done);
         if (expire)
           setTimeout(() => {
-            emitter.off('client', done); // expired
+            fastify.websocketServer.off('connection', done); // expired
             resolve();
           }, expire);
       });