diff --git a/src/acp/server.startup.test.ts b/src/acp/server.startup.test.ts
index 2f9b96d8511..35c43478ec9 100644
--- a/src/acp/server.startup.test.ts
+++ b/src/acp/server.startup.test.ts
@@ -129,6 +129,22 @@ describe("serveAcpGateway startup", () => {
     return { signalHandlers, onceSpy };
   }
 
+  async function emitHelloAndWaitForAgentSideConnection() {
+    const gateway = getMockGateway();
+    gateway.emitHello();
+    await vi.waitFor(() => {
+      expect(mockState.agentSideConnectionCtor).toHaveBeenCalledTimes(1);
+    });
+  }
+
+  async function stopServeWithSigint(
+    signalHandlers: Map<NodeJS.Signals, () => void>,
+    servePromise: Promise<void>,
+  ) {
+    signalHandlers.get("SIGINT")?.();
+    await servePromise;
+  }
+
   beforeAll(async () => {
     ({ serveAcpGateway } = await import("./server.js"));
   });
@@ -153,14 +169,8 @@ describe("serveAcpGateway startup", () => {
       await Promise.resolve();
 
       expect(mockState.agentSideConnectionCtor).not.toHaveBeenCalled();
-      const gateway = getMockGateway();
-      gateway.emitHello();
-      await vi.waitFor(() => {
-        expect(mockState.agentSideConnectionCtor).toHaveBeenCalledTimes(1);
-      });
-
-      signalHandlers.get("SIGINT")?.();
-      await servePromise;
+      await emitHelloAndWaitForAgentSideConnection();
+      await stopServeWithSigint(signalHandlers, servePromise);
     } finally {
       onceSpy.mockRestore();
     }
@@ -207,13 +217,8 @@ describe("serveAcpGateway startup", () => {
         password: "resolved-secret-password", // pragma: allowlist secret
       });
 
-      const gateway = getMockGateway();
-      gateway.emitHello();
-      await vi.waitFor(() => {
-        expect(mockState.agentSideConnectionCtor).toHaveBeenCalledTimes(1);
-      });
-      signalHandlers.get("SIGINT")?.();
-      await servePromise;
+      await emitHelloAndWaitForAgentSideConnection();
+      await stopServeWithSigint(signalHandlers, servePromise);
     } finally {
       onceSpy.mockRestore();
     }
@@ -236,13 +241,8 @@ describe("serveAcpGateway startup", () => {
         }),
       );
 
-      const gateway = getMockGateway();
-      gateway.emitHello();
-      await vi.waitFor(() => {
-        expect(mockState.agentSideConnectionCtor).toHaveBeenCalledTimes(1);
-      });
-      signalHandlers.get("SIGINT")?.();
-      await servePromise;
+      await emitHelloAndWaitForAgentSideConnection();
+      await stopServeWithSigint(signalHandlers, servePromise);
     } finally {
       onceSpy.mockRestore();
     }