diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
index 39ce5aeeff9..83b176cc26d 100644
--- a/src/Controller/Controller.php
+++ b/src/Controller/Controller.php
@@ -540,7 +540,7 @@ public function redirect($url, $status = 302)
 
         $response = $this->response;
         if ($status) {
-            $response->statusCode($status);
+            $response = $response->withStatus($status);
         }
 
         $event = $this->dispatchEvent('Controller.beforeRedirect', [$url, $response]);
diff --git a/src/TestSuite/LegacyRequestDispatcher.php b/src/TestSuite/LegacyRequestDispatcher.php
index 68f80d0a91b..84a40dc12e0 100644
--- a/src/TestSuite/LegacyRequestDispatcher.php
+++ b/src/TestSuite/LegacyRequestDispatcher.php
@@ -51,8 +51,6 @@ public function execute($request)
             ['priority' => 999],
             [$this->_test, 'controllerSpy']
         );
-        $dispatcher->dispatch($request, $response);
-
-        return $response;
+        return $dispatcher->dispatch($request, $response);
     }
 }
diff --git a/src/TestSuite/Stub/Response.php b/src/TestSuite/Stub/Response.php
index e4bd787f2ff..b68d0ce251b 100644
--- a/src/TestSuite/Stub/Response.php
+++ b/src/TestSuite/Stub/Response.php
@@ -24,7 +24,7 @@ class Response extends Base
     /**
      * Stub the send() method so headers and output are not sent.
      *
-     * @return void
+     * @return $this
      */
     public function send()
     {
@@ -32,5 +32,6 @@ public function send()
             $this->statusCode(302);
         }
         $this->_setContentType();
+        return $this;
     }
 }