diff --git a/src/gateway/server.agent.part-1.test.ts b/src/gateway/server.agent.gateway-server-agent-a.test.ts
similarity index 100%
rename from src/gateway/server.agent.part-1.test.ts
rename to src/gateway/server.agent.gateway-server-agent-a.test.ts
diff --git a/src/gateway/server.agent.part-2.test.ts b/src/gateway/server.agent.gateway-server-agent-b.test.ts
similarity index 100%
rename from src/gateway/server.agent.part-2.test.ts
rename to src/gateway/server.agent.gateway-server-agent-b.test.ts
diff --git a/src/gateway/server.agent.part-3.test.ts b/src/gateway/server.agent.gateway-server-agent.test.ts
similarity index 100%
rename from src/gateway/server.agent.part-3.test.ts
rename to src/gateway/server.agent.gateway-server-agent.test.ts
diff --git a/src/gateway/server.chat.part-2.test.ts b/src/gateway/server.chat.gateway-server-chat-b.test.ts
similarity index 100%
rename from src/gateway/server.chat.part-2.test.ts
rename to src/gateway/server.chat.gateway-server-chat-b.test.ts
diff --git a/src/gateway/server.chat.part-3.test.ts b/src/gateway/server.chat.gateway-server-chat-c.test.ts
similarity index 100%
rename from src/gateway/server.chat.part-3.test.ts
rename to src/gateway/server.chat.gateway-server-chat-c.test.ts
diff --git a/src/gateway/server.chat.part-1.test.ts b/src/gateway/server.chat.gateway-server-chat.test.ts
similarity index 100%
rename from src/gateway/server.chat.part-1.test.ts
rename to src/gateway/server.chat.gateway-server-chat.test.ts
diff --git a/src/gateway/server.node-bridge.part-2.test.ts b/src/gateway/server.node-bridge.gateway-server-node-bridge-b.test.ts
similarity index 100%
rename from src/gateway/server.node-bridge.part-2.test.ts
rename to src/gateway/server.node-bridge.gateway-server-node-bridge-b.test.ts
diff --git a/src/gateway/server.node-bridge.part-3.test.ts b/src/gateway/server.node-bridge.gateway-server-node-bridge-c.test.ts
similarity index 100%
rename from src/gateway/server.node-bridge.part-3.test.ts
rename to src/gateway/server.node-bridge.gateway-server-node-bridge-c.test.ts
diff --git a/src/gateway/server.node-bridge.part-1.test.ts b/src/gateway/server.node-bridge.gateway-server-node-bridge.test.ts
similarity index 100%
rename from src/gateway/server.node-bridge.part-1.test.ts
rename to src/gateway/server.node-bridge.gateway-server-node-bridge.test.ts
diff --git a/src/gateway/server.sessions.part-1.test.ts b/src/gateway/server.sessions.gateway-server-sessions-a.test.ts
similarity index 100%
rename from src/gateway/server.sessions.part-1.test.ts
rename to src/gateway/server.sessions.gateway-server-sessions-a.test.ts
diff --git a/src/gateway/server.sessions.part-2.test.ts b/src/gateway/server.sessions.gateway-server-sessions.test.ts
similarity index 100%
rename from src/gateway/server.sessions.part-2.test.ts
rename to src/gateway/server.sessions.gateway-server-sessions.test.ts
diff --git a/src/gateway/test-helpers.server.ts b/src/gateway/test-helpers.server.ts
index 2bb09392f..ad775550f 100644
--- a/src/gateway/test-helpers.server.ts
+++ b/src/gateway/test-helpers.server.ts
@@ -147,7 +147,10 @@ export async function occupyPort(): Promise<{
 export function onceMessage<T = unknown>(
   ws: WebSocket,
   filter: (obj: unknown) => boolean,
-  timeoutMs = 3000,
+  // Full-suite runs can saturate the event loop (581+ files). Keep this high
+  // enough to avoid flaky RPC timeouts, but still fail fast when a response
+  // never arrives.
+  timeoutMs = 10_000,
 ): Promise<T> {
   return new Promise<T>((resolve, reject) => {
     const timer = setTimeout(() => reject(new Error("timeout")), timeoutMs);