diff --git a/modules/caddyhttp/responsewriter_test.go b/modules/caddyhttp/responsewriter_test.go
index ec8c3b5ab..411116481 100644
--- a/modules/caddyhttp/responsewriter_test.go
+++ b/modules/caddyhttp/responsewriter_test.go
@@ -226,9 +226,6 @@ func TestResponseRecorderSwitchingProtocolsIsHijackAware(t *testing.T) {
 	})
 	rr.WriteHeader(http.StatusSwitchingProtocols)
 
-	if rr.Buffered() {
-		t.Fatal("101 switching protocols response should not remain buffered")
-	}
 	if rr.Status() != http.StatusSwitchingProtocols {
 		t.Fatalf("status = %d, want %d", rr.Status(), http.StatusSwitchingProtocols)
 	}
@@ -246,6 +243,9 @@ func TestResponseRecorderSwitchingProtocolsIsHijackAware(t *testing.T) {
 	}
 	defer conn.Close()
 
+	if rr.Buffered() {
+		t.Fatal("hijacked response should not remain buffered")
+	}
 	if rr.DetachAfterHijack(true) {
 		t.Fatal("response recorder should report hijacked state by returning false")
 	}
diff --git a/modules/caddyhttp/reverseproxy/streaming_test.go b/modules/caddyhttp/reverseproxy/streaming_test.go
index a7e3504b7..18acba3f4 100644
--- a/modules/caddyhttp/reverseproxy/streaming_test.go
+++ b/modules/caddyhttp/reverseproxy/streaming_test.go
@@ -173,6 +173,7 @@ func TestHandlerCleanupRetainModeClosesOnlyRemovedUpstreams(t *testing.T) {
 	})
 
 	ts := newTunnelState(caddy.Log(), 0)
+	registerDetachedTunnelStates(ts)
 	connA := newTrackingReadWriteCloser()
 	connB := newTrackingReadWriteCloser()
 	ts.registerConnection(connA, nil, true, upstreamA)