diff --git a/tests/Predis/Collection/Iterator/HashKeyTest.php b/tests/Predis/Collection/Iterator/HashKeyTest.php
index da138fb4..4935e759 100644
--- a/tests/Predis/Collection/Iterator/HashKeyTest.php
+++ b/tests/Predis/Collection/Iterator/HashKeyTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Collection\Iterator;
 
 use PredisTestCase;
-use Predis\Client;
 use Predis\Profile;
 
 /**
diff --git a/tests/Predis/Collection/Iterator/KeyspaceTest.php b/tests/Predis/Collection/Iterator/KeyspaceTest.php
index 338f32dd..361de284 100644
--- a/tests/Predis/Collection/Iterator/KeyspaceTest.php
+++ b/tests/Predis/Collection/Iterator/KeyspaceTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Collection\Iterator;
 
 use PredisTestCase;
-use Predis\Client;
 use Predis\Profile;
 
 /**
diff --git a/tests/Predis/Collection/Iterator/ListKeyTest.php b/tests/Predis/Collection/Iterator/ListKeyTest.php
index ad5a3327..227602d5 100644
--- a/tests/Predis/Collection/Iterator/ListKeyTest.php
+++ b/tests/Predis/Collection/Iterator/ListKeyTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Collection\Iterator;
 
 use PredisTestCase;
-use Predis\Client;
 use Predis\Profile;
 
 /**
diff --git a/tests/Predis/Collection/Iterator/SetKeyTest.php b/tests/Predis/Collection/Iterator/SetKeyTest.php
index 0c6beffd..1805dd3f 100644
--- a/tests/Predis/Collection/Iterator/SetKeyTest.php
+++ b/tests/Predis/Collection/Iterator/SetKeyTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Collection\Iterator;
 
 use PredisTestCase;
-use Predis\Client;
 use Predis\Profile;
 
 /**
diff --git a/tests/Predis/Collection/Iterator/SortedSetKeyTest.php b/tests/Predis/Collection/Iterator/SortedSetKeyTest.php
index 0ab27081..a733588d 100644
--- a/tests/Predis/Collection/Iterator/SortedSetKeyTest.php
+++ b/tests/Predis/Collection/Iterator/SortedSetKeyTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Collection\Iterator;
 
 use PredisTestCase;
-use Predis\Client;
 use Predis\Profile;
 
 /**
diff --git a/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php b/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
index d9d0aa49..9238cdf5 100644
--- a/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
+++ b/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
@@ -11,7 +11,6 @@
 
 namespace Predis\Command\Processor;
 
-use stdClass;
 use PredisTestCase;
 use Predis\Command\RawCommand;
 
diff --git a/tests/Predis/Connection/ConnectionExceptionTest.php b/tests/Predis/Connection/ConnectionExceptionTest.php
index 71cb4b6f..1a879ded 100644
--- a/tests/Predis/Connection/ConnectionExceptionTest.php
+++ b/tests/Predis/Connection/ConnectionExceptionTest.php
@@ -14,7 +14,6 @@ namespace Predis\Connection;
 require_once __DIR__.'/../CommunicationExceptionTest.php';
 
 use Predis\CommunicationExceptionTest;
-use Predis\Connection\SingleConnectionInterface;
 
 /**
  *
diff --git a/tests/Predis/Replication/ReplicationStrategyTest.php b/tests/Predis/Replication/ReplicationStrategyTest.php
index e8142d26..ca12fc05 100644
--- a/tests/Predis/Replication/ReplicationStrategyTest.php
+++ b/tests/Predis/Replication/ReplicationStrategyTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Replication;
 
 use PredisTestCase;
-use Predis\Command\CommandInterface;
 use Predis\Profile;
 
 /**