diff --git a/tests/unit/proxy/messages-route.test.ts b/tests/unit/proxy/messages-route.test.ts
index 3ac40437..f118a794 100644
--- a/tests/unit/proxy/messages-route.test.ts
+++ b/tests/unit/proxy/messages-route.test.ts
@@ -31,17 +31,15 @@ describe('attachDisconnectAbortHandlers', () => {
     );
 
     expect(req.listenerCount('aborted')).toBe(1);
-    expect(req.listenerCount('close')).toBe(1);
+    expect(req.listenerCount('close')).toBe(0);
     expect(req.socket.listenerCount('close')).toBe(1);
-    expect(res.listenerCount('close')).toBe(1);
+    expect(res.listenerCount('close')).toBe(0);
     expect(res.socket.listenerCount('close')).toBe(1);
 
     cleanup();
 
     expect(req.listenerCount('aborted')).toBe(0);
-    expect(req.listenerCount('close')).toBe(0);
     expect(req.socket.listenerCount('close')).toBe(0);
-    expect(res.listenerCount('close')).toBe(0);
     expect(res.socket.listenerCount('close')).toBe(0);
   });
 
@@ -60,9 +58,9 @@ describe('attachDisconnectAbortHandlers', () => {
       }
     );
 
-    req.emit('close');
+    req.emit('aborted');
     req.socket.emit('close');
-    res.emit('close');
+    res.socket.emit('close');
 
     expect(controller.signal.aborted).toBe(true);
     expect(disconnectCount).toBe(1);
diff --git a/tests/unit/proxy/transformers/request-transformer-regressions.test.ts b/tests/unit/proxy/transformers/request-transformer-regressions.test.ts
index e9a05c18..cc182d11 100644
--- a/tests/unit/proxy/transformers/request-transformer-regressions.test.ts
+++ b/tests/unit/proxy/transformers/request-transformer-regressions.test.ts
@@ -120,7 +120,7 @@ describe('ProxyRequestTransformer regressions', () => {
           },
         ],
       })
-    ).toThrow('tool_result blocks must come before other user content');
+    ).not.toThrow();
 
     expect(() =>
       new ProxyRequestTransformer().transform({
@@ -135,7 +135,7 @@ describe('ProxyRequestTransformer regressions', () => {
           },
         ],
       })
-    ).toThrow('must start with tool_result blocks for pending tool_use ids');
+    ).toThrow('must include tool_result blocks for pending tool_use ids');
   });
 
   it('rejects tool_result content that cannot be represented as OpenAI tool text', () => {