diff --git a/test/aleph/http_test.clj b/test/aleph/http_test.clj
index 4bf304ce..23a14202 100644
--- a/test/aleph/http_test.clj
+++ b/test/aleph/http_test.clj
@@ -1074,13 +1074,10 @@
     (Thread/sleep 5)
     (s/put! s (encode-http-object response))))
 
-(defmacro with-tcp-server [handler & body]
-  `(with-server (tcp/start-server ~handler {:port port
-                                            :shutdown-timeout 0})
-     ~@body))
-
 (defmacro with-tcp-response [response & body]
-  `(with-tcp-server (tcp-handler ~response) ~@body))
+  `(with-server (tcp/start-server (tcp-handler ~response) {:port port
+                                                           :shutdown-timeout 0})
+     ~@body))
 
 (defmacro with-tcp-request-handler [handler options request & body]
   `(with-server (http/start-server ~handler (merge http-server-options ~options))
@@ -1446,12 +1443,11 @@
 (deftest test-in-flight-request-cancellation
   (let [conn-established (promise)
         conn-closed (promise)]
-    (with-tcp-server (fn [s _]
-                       (deliver conn-established true)
-                       ;; Required for the client close to be detected
-                       (s/consume identity s)
-                       (s/on-closed s (fn []
-                                        (deliver conn-closed true))))
+    (with-raw-handler (fn [req]
+                        (deliver conn-established true)
+                        (s/on-closed (:body req)
+                                     (fn []
+                                       (deliver conn-closed true))))
       (let [rsp (http-get "/")]
         (is (= true (deref conn-established 1000 :timeout)))
         (http/cancel-request! rsp)