diff --git a/tests/Predis/Protocol/Text/Handler/IntegerResponse.php b/tests/Predis/Protocol/Text/Handler/IntegerResponseTest.php
similarity index 100%
rename from tests/Predis/Protocol/Text/Handler/IntegerResponse.php
rename to tests/Predis/Protocol/Text/Handler/IntegerResponseTest.php
diff --git a/tests/Predis/Protocol/Text/Handler/MultiBulkResponse.php b/tests/Predis/Protocol/Text/Handler/MultiBulkResponseTest.php
similarity index 100%
rename from tests/Predis/Protocol/Text/Handler/MultiBulkResponse.php
rename to tests/Predis/Protocol/Text/Handler/MultiBulkResponseTest.php
diff --git a/tests/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php b/tests/Predis/Protocol/Text/Handler/StreamableMultiBulkResponseTest.php
similarity index 91%
rename from tests/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
rename to tests/Predis/Protocol/Text/Handler/StreamableMultiBulkResponseTest.php
index 2395aa7a..9caaa5bc 100644
--- a/tests/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
+++ b/tests/Predis/Protocol/Text/Handler/StreamableMultiBulkResponseTest.php
@@ -30,7 +30,7 @@ class StreamableMultiBulkResponseTest extends StandardTestCase
         $connection->expects($this->never())->method('readLine');
         $connection->expects($this->never())->method('readBytes');
 
-        $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseSimple', $handler->handle($connection, '1'));
+        $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseSimple', $handler->handle($connection, '1'));
     }
 
     /**