diff --git a/test/RequestTest.php b/test/RequestTest.php
index 00aef103..c20a56cc 100644
--- a/test/RequestTest.php
+++ b/test/RequestTest.php
@@ -24,12 +24,12 @@ class RequestTest extends TestCase
 
     public function setUp()
     {
-        $this->request = new Request();
+        $this->request = $this->createDefaultRequest();
     }
 
     protected function createDefaultRequest()
     {
-        return $this->request;
+        return new Request();
     }
 
     public function testConstructorRaisesExceptionForInvalidStream()
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
index 28174260..04b3abca 100644
--- a/test/ResponseTest.php
+++ b/test/ResponseTest.php
@@ -23,12 +23,12 @@ class ResponseTest extends TestCase
 
     public function setUp()
     {
-        $this->response = new Response();
+        $this->response = $this->createDefaultResponse();
     }
 
     protected function createDefaultResponse()
     {
-        return $this->response;
+        return new Response();
     }
 
     public function testStatusCodeIs200ByDefault()
diff --git a/test/ServerRequestTest.php b/test/ServerRequestTest.php
index 98a57dae..dddb707f 100644
--- a/test/ServerRequestTest.php
+++ b/test/ServerRequestTest.php
@@ -25,12 +25,12 @@ class ServerRequestTest extends TestCase
 
     public function setUp()
     {
-        $this->request = new ServerRequest();
+        $this->request = $this->createDefaultServerRequest();
     }
 
     protected function createDefaultServerRequest()
     {
-        return $this->request;
+        return new ServerRequest();
     }
 
     public function testServerParamsAreEmptyByDefault()