diff --git a/tests/PHPUnit/PredisCommandTestCase.php b/tests/PHPUnit/PredisCommandTestCase.php
index 913f4c92..bb361405 100644
--- a/tests/PHPUnit/PredisCommandTestCase.php
+++ b/tests/PHPUnit/PredisCommandTestCase.php
@@ -24,14 +24,14 @@ abstract class PredisCommandTestCase extends PredisTestCase
      *
      * @return CommandInterface|string Instance or FQN of the expected command.
      */
-    protected abstract function getExpectedCommand();
+    abstract protected function getExpectedCommand();
 
     /**
      * Returns the expected command ID.
      *
      * @return string
      */
-    protected abstract function getExpectedId();
+    abstract protected function getExpectedId();
 
     /**
      * Returns a new command instance.
@@ -48,7 +48,7 @@ abstract class PredisCommandTestCase extends PredisTestCase
     /**
      * Returns a new client instance.
      *
-     * @param bool $connect Flush selected database before returning the client.
+     * @param  bool   $connect Flush selected database before returning the client.
      * @return Client
      */
     public function getClient($flushdb = true)
@@ -90,7 +90,7 @@ abstract class PredisCommandTestCase extends PredisTestCase
     /**
      * Returns a new command instance with the specified arguments.
      *
-     * @param array $arguments Arguments for the command.
+     * @param  array            $arguments Arguments for the command.
      * @return CommandInterface
      */
     protected function getCommandWithArgumentsArray(Array $arguments)
diff --git a/tests/PHPUnit/PredisConnectionTestCase.php b/tests/PHPUnit/PredisConnectionTestCase.php
index 1ae70e00..6fceca02 100644
--- a/tests/PHPUnit/PredisConnectionTestCase.php
+++ b/tests/PHPUnit/PredisConnectionTestCase.php
@@ -324,10 +324,10 @@ abstract class PredisConnectionTestCase extends PredisTestCase
     /**
      * Returns a new instance of a connection instance.
      *
-     * @param ServerProfile $profile Reference to the server profile instance.
-     * @param Boolean $initialize Push default initialization commands (SELECT and FLUSHDB).
-     * @param array $parameters Additional connection parameters.
+     * @param  ServerProfile    $profile    Reference to the server profile instance.
+     * @param  Boolean          $initialize Push default initialization commands (SELECT and FLUSHDB).
+     * @param  array            $parameters Additional connection parameters.
      * @return StreamConnection
      */
-    protected abstract function getConnection(&$profile = null, $initialize = false, Array $parameters = array());
+    abstract protected function getConnection(&$profile = null, $initialize = false, Array $parameters = array());
 }
diff --git a/tests/PHPUnit/PredisDistributorTestCase.php b/tests/PHPUnit/PredisDistributorTestCase.php
index 91bd1d4e..29e06aaa 100644
--- a/tests/PHPUnit/PredisDistributorTestCase.php
+++ b/tests/PHPUnit/PredisDistributorTestCase.php
@@ -23,14 +23,14 @@ abstract class PredisDistributorTestCase extends PredisTestCase
      *
      * @return Predis\Cluster\Distribution\DistributionStrategyInterface
      */
-    protected abstract function getDistributorInstance();
+    abstract protected function getDistributorInstance();
 
     /**
      * Returns a list of nodes from the hashring.
      *
-     * @param DistributionStrategyInterface $ring Hashring instance.
-     * @param int $iterations Number of nodes to fetch.
-     * @return array Nodes from the hashring.
+     * @param  DistributionStrategyInterface $ring       Hashring instance.
+     * @param  int                           $iterations Number of nodes to fetch.
+     * @return array                         Nodes from the hashring.
      */
     protected function getNodes(DistributionStrategyInterface $ring, $iterations = 10)
     {
diff --git a/tests/PHPUnit/PredisProfileTestCase.php b/tests/PHPUnit/PredisProfileTestCase.php
index 67f67fb1..cc99bc41 100644
--- a/tests/PHPUnit/PredisProfileTestCase.php
+++ b/tests/PHPUnit/PredisProfileTestCase.php
@@ -33,20 +33,20 @@ abstract class PredisProfileTestCase extends PredisTestCase
      *
      * @return string Version string.
      */
-    protected abstract function getExpectedVersion();
+    abstract protected function getExpectedVersion();
 
     /**
      * Returns the expected list of commands supported by the tested profile.
      *
      * @return array List of supported commands.
      */
-    protected abstract function getExpectedCommands();
+    abstract protected function getExpectedCommands();
 
     /**
      * Returns the list of commands supported by the current
      * server profile.
      *
-     * @param ServerProfileInterface $profile Server profile instance.
+     * @param  ServerProfileInterface $profile Server profile instance.
      * @return array
      */
     protected function getCommands(ServerProfileInterface $profile)
diff --git a/tests/PHPUnit/PredisTestCase.php b/tests/PHPUnit/PredisTestCase.php
index 2d265ee2..20cf7037 100644
--- a/tests/PHPUnit/PredisTestCase.php
+++ b/tests/PHPUnit/PredisTestCase.php
@@ -24,8 +24,8 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
      * Verifies that a Redis command is a valid Predis\Command\CommandInterface
      * instance with the specified ID and command arguments.
      *
-     * @param string|CommandInterface $command Expected command or command ID.
-     * @param array $arguments Expected command arguments.
+     * @param string|CommandInterface $command   Expected command or command ID.
+     * @param array                   $arguments Expected command arguments.
      */
     public function isRedisCommand($command = null, array $arguments = null)
     {
@@ -39,7 +39,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
      * instance for $expected.
      *
      * @param array|string|CommandInterface $expected Expected command.
-     * @param mixed $actual Actual command.
+     * @param mixed                         $actual   Actual command.
      */
     public function assertRedisCommand($expected, $actual)
     {
@@ -57,7 +57,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
      * Asserts that two arrays have the same values, even if with different order.
      *
      * @param array $expected Expected array.
-     * @param array $actual Actual array.
+     * @param array $actual   Actual array.
      */
     public function assertSameValues(array $expected, array $actual)
     {
@@ -95,7 +95,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
      * Returns a named array with the default connection parameters merged with
      * the specified additional parameters.
      *
-     * @param array $additional Additional connection parameters.
+     * @param  array $additional Additional connection parameters.
      * @return array Connection parameters.
      */
     protected function getParametersArray(array $additional)
@@ -106,7 +106,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
     /**
      * Returns a new instance of connection parameters.
      *
-     * @param array $additional Additional connection parameters.
+     * @param  array                           $additional Additional connection parameters.
      * @return Connection\ConnectionParameters Default connection parameters.
      */
     protected function getParameters($additional = array())
@@ -120,7 +120,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
     /**
      * Returns a new instance of server profile.
      *
-     * @param array $additional Additional connection parameters.
+     * @param  array                  $additional Additional connection parameters.
      * @return ServerProfileInterface
      */
     protected function getProfile($version = null)
@@ -131,7 +131,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
     /**
      * Returns a new client instance.
      *
-     * @param bool $connect Flush selected database before returning the client.
+     * @param  bool   $connect Flush selected database before returning the client.
      * @return Client
      */
     protected function createClient(array $parameters = null, array $options = null, $flushdb = true)
@@ -159,8 +159,8 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @param  string $expectedVersion Expected redis version
-     * @param  string $operator Comparison operator.
+     * @param  string                              $expectedVersion Expected redis version
+     * @param  string                              $operator        Comparison operator.
      * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
      */
     protected function executeOnRedisVersion($expectedVersion, $operator, $callback)
@@ -171,7 +171,7 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
         if (isset($info['server']['redis_version'])) {
             // Redis >= 2.6
             $version = $info['server']['redis_version'];
-        } else if (isset($info['redis_version'])) {
+        } elseif (isset($info['redis_version'])) {
             // Redis < 2.6
             $version = $info['redis_version'];
         } else {
@@ -188,8 +188,8 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @param  string $expectedVersion Expected redis version
-     * @param  string $operator Comparison operator.
+     * @param  string                              $expectedVersion Expected redis version
+     * @param  string                              $operator        Comparison operator.
      * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
      */
     protected function executeOnProfileVersion($expectedVersion, $operator, $callback)
@@ -205,10 +205,10 @@ abstract class PredisTestCase extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @param  string $expectedVersion Expected redis version.
-     * @param  string $message Optional message.
-     * @param  bool $remote Based on local profile or remote redis version.
-     * @throws RuntimeException when unable to retrieve server info or redis version
+     * @param  string                              $expectedVersion Expected redis version.
+     * @param  string                              $message         Optional message.
+     * @param  bool                                $remote          Based on local profile or remote redis version.
+     * @throws RuntimeException                    when unable to retrieve server info or redis version
      * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
      */
     public function markTestSkippedOnRedisVersionBelow($expectedVersion, $message = '', $remote = true)
diff --git a/tests/PHPUnit/RedisCommandConstraint.php b/tests/PHPUnit/RedisCommandConstraint.php
index df83e040..9253d0b5 100644
--- a/tests/PHPUnit/RedisCommandConstraint.php
+++ b/tests/PHPUnit/RedisCommandConstraint.php
@@ -94,4 +94,4 @@ class RedisCommandConstraint extends PHPUnit_Framework_Constraint
 
         return "$string {$this->toString()}";
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php
index 5c3e41de..314e47c7 100644
--- a/tests/Predis/ClientTest.php
+++ b/tests/Predis/ClientTest.php
@@ -754,7 +754,7 @@ class ClientTest extends PredisTestCase
     /**
      * Returns an URI string representation of the specified connection parameters.
      *
-     * @param Array $parameters Array of connection parameters.
+     * @param  Array  $parameters Array of connection parameters.
      * @return String URI string.
      */
     protected function getParametersString(Array $parameters)
diff --git a/tests/Predis/Cluster/PredisClusterHashStrategyTest.php b/tests/Predis/Cluster/PredisClusterHashStrategyTest.php
index 12be4314..b9bdb9c7 100644
--- a/tests/Predis/Cluster/PredisClusterHashStrategyTest.php
+++ b/tests/Predis/Cluster/PredisClusterHashStrategyTest.php
@@ -244,7 +244,7 @@ class PredisClusterHashStrategyTest extends PredisTestCase
     /**
      * Returns the list of expected supported commands.
      *
-     * @param string $type Optional type of command (based on its keys)
+     * @param  string $type Optional type of command (based on its keys)
      * @return array
      */
     protected function getExpectedCommands($type = null)
diff --git a/tests/Predis/Cluster/RedisClusterHashStrategyTest.php b/tests/Predis/Cluster/RedisClusterHashStrategyTest.php
index d403215c..3bc34938 100644
--- a/tests/Predis/Cluster/RedisClusterHashStrategyTest.php
+++ b/tests/Predis/Cluster/RedisClusterHashStrategyTest.php
@@ -250,7 +250,7 @@ class RedisClusterHashStrategyTest extends PredisTestCase
     /**
      * Returns the list of expected supported commands.
      *
-     * @param string $type Optional type of command (based on its keys)
+     * @param  string $type Optional type of command (based on its keys)
      * @return array
      */
     protected function getExpectedCommands($type = null)
diff --git a/tests/Predis/Command/ConnectionAuthTest.php b/tests/Predis/Command/ConnectionAuthTest.php
index be4ceb8d..6248a32a 100644
--- a/tests/Predis/Command/ConnectionAuthTest.php
+++ b/tests/Predis/Command/ConnectionAuthTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-connection
diff --git a/tests/Predis/Command/ConnectionEchoTest.php b/tests/Predis/Command/ConnectionEchoTest.php
index e942f83d..3d506c7a 100644
--- a/tests/Predis/Command/ConnectionEchoTest.php
+++ b/tests/Predis/Command/ConnectionEchoTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-connection
diff --git a/tests/Predis/Command/ConnectionPingTest.php b/tests/Predis/Command/ConnectionPingTest.php
index 73dea93b..725337da 100644
--- a/tests/Predis/Command/ConnectionPingTest.php
+++ b/tests/Predis/Command/ConnectionPingTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-connection
diff --git a/tests/Predis/Command/ConnectionQuitTest.php b/tests/Predis/Command/ConnectionQuitTest.php
index 94e362a0..1be47a54 100644
--- a/tests/Predis/Command/ConnectionQuitTest.php
+++ b/tests/Predis/Command/ConnectionQuitTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-connection
diff --git a/tests/Predis/Command/ConnectionSelectTest.php b/tests/Predis/Command/ConnectionSelectTest.php
index 8ede9d37..6e253fa8 100644
--- a/tests/Predis/Command/ConnectionSelectTest.php
+++ b/tests/Predis/Command/ConnectionSelectTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-connection
diff --git a/tests/Predis/Command/HashDeleteTest.php b/tests/Predis/Command/HashDeleteTest.php
index 0f6e8c84..e904f0a9 100644
--- a/tests/Predis/Command/HashDeleteTest.php
+++ b/tests/Predis/Command/HashDeleteTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashExistsTest.php b/tests/Predis/Command/HashExistsTest.php
index 7742c73a..a7975a60 100644
--- a/tests/Predis/Command/HashExistsTest.php
+++ b/tests/Predis/Command/HashExistsTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashGetAllTest.php b/tests/Predis/Command/HashGetAllTest.php
index 5729c611..b24b52bf 100644
--- a/tests/Predis/Command/HashGetAllTest.php
+++ b/tests/Predis/Command/HashGetAllTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashGetMultipleTest.php b/tests/Predis/Command/HashGetMultipleTest.php
index dc833f77..d013bdca 100644
--- a/tests/Predis/Command/HashGetMultipleTest.php
+++ b/tests/Predis/Command/HashGetMultipleTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashGetTest.php b/tests/Predis/Command/HashGetTest.php
index b31c48cc..23684470 100644
--- a/tests/Predis/Command/HashGetTest.php
+++ b/tests/Predis/Command/HashGetTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashIncrementByFloatTest.php b/tests/Predis/Command/HashIncrementByFloatTest.php
index 67f503f7..8e78c97d 100644
--- a/tests/Predis/Command/HashIncrementByFloatTest.php
+++ b/tests/Predis/Command/HashIncrementByFloatTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashIncrementByTest.php b/tests/Predis/Command/HashIncrementByTest.php
index 39104bb8..79d63be2 100644
--- a/tests/Predis/Command/HashIncrementByTest.php
+++ b/tests/Predis/Command/HashIncrementByTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashKeysTest.php b/tests/Predis/Command/HashKeysTest.php
index d2c2e419..36e6d946 100644
--- a/tests/Predis/Command/HashKeysTest.php
+++ b/tests/Predis/Command/HashKeysTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashLengthTest.php b/tests/Predis/Command/HashLengthTest.php
index c100ddfb..1599cd92 100644
--- a/tests/Predis/Command/HashLengthTest.php
+++ b/tests/Predis/Command/HashLengthTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashScanTest.php b/tests/Predis/Command/HashScanTest.php
index f8e3d764..22886038 100644
--- a/tests/Predis/Command/HashScanTest.php
+++ b/tests/Predis/Command/HashScanTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashSetMultipleTest.php b/tests/Predis/Command/HashSetMultipleTest.php
index 29015348..9a7379b3 100644
--- a/tests/Predis/Command/HashSetMultipleTest.php
+++ b/tests/Predis/Command/HashSetMultipleTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashSetPreserveTest.php b/tests/Predis/Command/HashSetPreserveTest.php
index c91d6d3d..c8367bc4 100644
--- a/tests/Predis/Command/HashSetPreserveTest.php
+++ b/tests/Predis/Command/HashSetPreserveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashSetTest.php b/tests/Predis/Command/HashSetTest.php
index 59c1d8d4..e5177867 100644
--- a/tests/Predis/Command/HashSetTest.php
+++ b/tests/Predis/Command/HashSetTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/HashValuesTest.php b/tests/Predis/Command/HashValuesTest.php
index c226d9bb..7bae8caf 100644
--- a/tests/Predis/Command/HashValuesTest.php
+++ b/tests/Predis/Command/HashValuesTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-hash
diff --git a/tests/Predis/Command/KeyDeleteTest.php b/tests/Predis/Command/KeyDeleteTest.php
index 8c7b8a94..2e9bd922 100644
--- a/tests/Predis/Command/KeyDeleteTest.php
+++ b/tests/Predis/Command/KeyDeleteTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyDumpTest.php b/tests/Predis/Command/KeyDumpTest.php
index ca572ec5..c9adcf23 100644
--- a/tests/Predis/Command/KeyDumpTest.php
+++ b/tests/Predis/Command/KeyDumpTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyExistsTest.php b/tests/Predis/Command/KeyExistsTest.php
index 1c435fbb..eedf0544 100644
--- a/tests/Predis/Command/KeyExistsTest.php
+++ b/tests/Predis/Command/KeyExistsTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyExpireAtTest.php b/tests/Predis/Command/KeyExpireAtTest.php
index bf880621..9208b0ee 100644
--- a/tests/Predis/Command/KeyExpireAtTest.php
+++ b/tests/Predis/Command/KeyExpireAtTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyExpireTest.php b/tests/Predis/Command/KeyExpireTest.php
index 07df416b..71e9fdd5 100644
--- a/tests/Predis/Command/KeyExpireTest.php
+++ b/tests/Predis/Command/KeyExpireTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyKeysTest.php b/tests/Predis/Command/KeyKeysTest.php
index 05bfe5e6..ec37d99a 100644
--- a/tests/Predis/Command/KeyKeysTest.php
+++ b/tests/Predis/Command/KeyKeysTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyKeysV12xTest.php b/tests/Predis/Command/KeyKeysV12xTest.php
index b0286ce9..9313adfa 100644
--- a/tests/Predis/Command/KeyKeysV12xTest.php
+++ b/tests/Predis/Command/KeyKeysV12xTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * We only perform disconnected tests for this commands because
  * it is too old (Redis v1.2) and expects a different response
diff --git a/tests/Predis/Command/KeyMoveTest.php b/tests/Predis/Command/KeyMoveTest.php
index 200de300..8aa8ad44 100644
--- a/tests/Predis/Command/KeyMoveTest.php
+++ b/tests/Predis/Command/KeyMoveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyPersistTest.php b/tests/Predis/Command/KeyPersistTest.php
index 1af204d5..495c953a 100644
--- a/tests/Predis/Command/KeyPersistTest.php
+++ b/tests/Predis/Command/KeyPersistTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyPreciseExpireAtTest.php b/tests/Predis/Command/KeyPreciseExpireAtTest.php
index 74d1e103..ed0c3008 100644
--- a/tests/Predis/Command/KeyPreciseExpireAtTest.php
+++ b/tests/Predis/Command/KeyPreciseExpireAtTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyPreciseExpireTest.php b/tests/Predis/Command/KeyPreciseExpireTest.php
index 4d05d9bc..7fd12ab7 100644
--- a/tests/Predis/Command/KeyPreciseExpireTest.php
+++ b/tests/Predis/Command/KeyPreciseExpireTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyPreciseTimeToLiveTest.php b/tests/Predis/Command/KeyPreciseTimeToLiveTest.php
index b5ed4645..1cc39450 100644
--- a/tests/Predis/Command/KeyPreciseTimeToLiveTest.php
+++ b/tests/Predis/Command/KeyPreciseTimeToLiveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyRandomTest.php b/tests/Predis/Command/KeyRandomTest.php
index 3665534f..5a2dd880 100644
--- a/tests/Predis/Command/KeyRandomTest.php
+++ b/tests/Predis/Command/KeyRandomTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyRenamePreserveTest.php b/tests/Predis/Command/KeyRenamePreserveTest.php
index 04ec2649..9a549c86 100644
--- a/tests/Predis/Command/KeyRenamePreserveTest.php
+++ b/tests/Predis/Command/KeyRenamePreserveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyRenameTest.php b/tests/Predis/Command/KeyRenameTest.php
index e2207ede..5d8e59ae 100644
--- a/tests/Predis/Command/KeyRenameTest.php
+++ b/tests/Predis/Command/KeyRenameTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyRestoreTest.php b/tests/Predis/Command/KeyRestoreTest.php
index eed7682c..95b2d3dc 100644
--- a/tests/Predis/Command/KeyRestoreTest.php
+++ b/tests/Predis/Command/KeyRestoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyScanTest.php b/tests/Predis/Command/KeyScanTest.php
index 0508406b..62d36d7a 100644
--- a/tests/Predis/Command/KeyScanTest.php
+++ b/tests/Predis/Command/KeyScanTest.php
@@ -11,7 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeySortTest.php b/tests/Predis/Command/KeySortTest.php
index c94cc41a..d1862d5c 100644
--- a/tests/Predis/Command/KeySortTest.php
+++ b/tests/Predis/Command/KeySortTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
@@ -38,8 +36,8 @@ class KeySortTest extends PredisCommandTestCase
     /**
      * Utility method to to an LPUSH of some unordered values on a key.
      *
-     * @param Predis\Client $redis Redis client instance.
-     * @param string $key Target key
+     * @param  Predis\Client $redis Redis client instance.
+     * @param  string        $key   Target key
      * @return array
      */
     protected function lpushUnorderedList(Predis\Client $redis, $key)
diff --git a/tests/Predis/Command/KeyTimeToLiveTest.php b/tests/Predis/Command/KeyTimeToLiveTest.php
index ea068eac..98aca39e 100644
--- a/tests/Predis/Command/KeyTimeToLiveTest.php
+++ b/tests/Predis/Command/KeyTimeToLiveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/KeyTypeTest.php b/tests/Predis/Command/KeyTypeTest.php
index c14fe294..870dbfed 100644
--- a/tests/Predis/Command/KeyTypeTest.php
+++ b/tests/Predis/Command/KeyTypeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-key
diff --git a/tests/Predis/Command/ListIndexTest.php b/tests/Predis/Command/ListIndexTest.php
index 7f5f75db..623c02d0 100644
--- a/tests/Predis/Command/ListIndexTest.php
+++ b/tests/Predis/Command/ListIndexTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListInsertTest.php b/tests/Predis/Command/ListInsertTest.php
index 9cb6e185..20dcd0e7 100644
--- a/tests/Predis/Command/ListInsertTest.php
+++ b/tests/Predis/Command/ListInsertTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListLengthTest.php b/tests/Predis/Command/ListLengthTest.php
index 7ff05508..7fac2c0d 100644
--- a/tests/Predis/Command/ListLengthTest.php
+++ b/tests/Predis/Command/ListLengthTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPopFirstBlockingTest.php b/tests/Predis/Command/ListPopFirstBlockingTest.php
index 79f36876..140b3b0a 100644
--- a/tests/Predis/Command/ListPopFirstBlockingTest.php
+++ b/tests/Predis/Command/ListPopFirstBlockingTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPopFirstTest.php b/tests/Predis/Command/ListPopFirstTest.php
index 0ef1c73b..b95d1c56 100644
--- a/tests/Predis/Command/ListPopFirstTest.php
+++ b/tests/Predis/Command/ListPopFirstTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPopLastBlockingTest.php b/tests/Predis/Command/ListPopLastBlockingTest.php
index c5817949..4b9fce10 100644
--- a/tests/Predis/Command/ListPopLastBlockingTest.php
+++ b/tests/Predis/Command/ListPopLastBlockingTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php b/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php
index b0eaabd3..2835a525 100644
--- a/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php
+++ b/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPopLastPushHeadTest.php b/tests/Predis/Command/ListPopLastPushHeadTest.php
index dc3332c0..f6a350c4 100644
--- a/tests/Predis/Command/ListPopLastPushHeadTest.php
+++ b/tests/Predis/Command/ListPopLastPushHeadTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPopLastTest.php b/tests/Predis/Command/ListPopLastTest.php
index 68c54b91..fd25bd1d 100644
--- a/tests/Predis/Command/ListPopLastTest.php
+++ b/tests/Predis/Command/ListPopLastTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPushHeadTest.php b/tests/Predis/Command/ListPushHeadTest.php
index e855a2cc..acb2c292 100644
--- a/tests/Predis/Command/ListPushHeadTest.php
+++ b/tests/Predis/Command/ListPushHeadTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPushHeadXTest.php b/tests/Predis/Command/ListPushHeadXTest.php
index 3879bbe9..c37698cb 100644
--- a/tests/Predis/Command/ListPushHeadXTest.php
+++ b/tests/Predis/Command/ListPushHeadXTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPushTailTest.php b/tests/Predis/Command/ListPushTailTest.php
index 8538de98..70731f11 100644
--- a/tests/Predis/Command/ListPushTailTest.php
+++ b/tests/Predis/Command/ListPushTailTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListPushTailXTest.php b/tests/Predis/Command/ListPushTailXTest.php
index e79e1698..30b968c8 100644
--- a/tests/Predis/Command/ListPushTailXTest.php
+++ b/tests/Predis/Command/ListPushTailXTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListRangeTest.php b/tests/Predis/Command/ListRangeTest.php
index e74726b3..f70b0b83 100644
--- a/tests/Predis/Command/ListRangeTest.php
+++ b/tests/Predis/Command/ListRangeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListRemoveTest.php b/tests/Predis/Command/ListRemoveTest.php
index 06586bb7..6711e00b 100644
--- a/tests/Predis/Command/ListRemoveTest.php
+++ b/tests/Predis/Command/ListRemoveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListSetTest.php b/tests/Predis/Command/ListSetTest.php
index 6a3225b8..8647b46b 100644
--- a/tests/Predis/Command/ListSetTest.php
+++ b/tests/Predis/Command/ListSetTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/ListTrimTest.php b/tests/Predis/Command/ListTrimTest.php
index 3fe0f52f..1e1c3996 100644
--- a/tests/Predis/Command/ListTrimTest.php
+++ b/tests/Predis/Command/ListTrimTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-list
diff --git a/tests/Predis/Command/PubSubPublishTest.php b/tests/Predis/Command/PubSubPublishTest.php
index 922e8503..3196f188 100644
--- a/tests/Predis/Command/PubSubPublishTest.php
+++ b/tests/Predis/Command/PubSubPublishTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub
diff --git a/tests/Predis/Command/PubSubSubscribeByPatternTest.php b/tests/Predis/Command/PubSubSubscribeByPatternTest.php
index 61dd4cb4..f384206b 100644
--- a/tests/Predis/Command/PubSubSubscribeByPatternTest.php
+++ b/tests/Predis/Command/PubSubSubscribeByPatternTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub
diff --git a/tests/Predis/Command/PubSubSubscribeTest.php b/tests/Predis/Command/PubSubSubscribeTest.php
index e74bc3d8..47f02fde 100644
--- a/tests/Predis/Command/PubSubSubscribeTest.php
+++ b/tests/Predis/Command/PubSubSubscribeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub
diff --git a/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php b/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php
index c9cf2bf9..bbb1923e 100644
--- a/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php
+++ b/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub
diff --git a/tests/Predis/Command/PubSubUnsubscribeTest.php b/tests/Predis/Command/PubSubUnsubscribeTest.php
index 9f0e9d76..c93927df 100644
--- a/tests/Predis/Command/PubSubUnsubscribeTest.php
+++ b/tests/Predis/Command/PubSubUnsubscribeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub
diff --git a/tests/Predis/Command/ScriptedCommandTest.php b/tests/Predis/Command/ScriptedCommandTest.php
index 3680d8e3..b3709281 100644
--- a/tests/Predis/Command/ScriptedCommandTest.php
+++ b/tests/Predis/Command/ScriptedCommandTest.php
@@ -37,7 +37,6 @@ class ScriptedCommandTest extends PredisTestCase
                 ->will($this->returnValue(2));
         $command->setArguments($arguments);
 
-
         $this->assertSame(array_merge(array(self::LUA_SCRIPT_SHA1, 2), $arguments), $command->getArguments());
     }
 
diff --git a/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php b/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php
index dd9c9d5f..9706f112 100644
--- a/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php
+++ b/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerBackgroundSaveTest.php b/tests/Predis/Command/ServerBackgroundSaveTest.php
index b18ba16a..54d3b2fd 100644
--- a/tests/Predis/Command/ServerBackgroundSaveTest.php
+++ b/tests/Predis/Command/ServerBackgroundSaveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerClientTest.php b/tests/Predis/Command/ServerClientTest.php
index 7641ae2a..db053de5 100644
--- a/tests/Predis/Command/ServerClientTest.php
+++ b/tests/Predis/Command/ServerClientTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerConfigTest.php b/tests/Predis/Command/ServerConfigTest.php
index 542690b5..e27e0927 100644
--- a/tests/Predis/Command/ServerConfigTest.php
+++ b/tests/Predis/Command/ServerConfigTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerDatabaseSizeTest.php b/tests/Predis/Command/ServerDatabaseSizeTest.php
index 6041dfab..b984e373 100644
--- a/tests/Predis/Command/ServerDatabaseSizeTest.php
+++ b/tests/Predis/Command/ServerDatabaseSizeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerEvalSHATest.php b/tests/Predis/Command/ServerEvalSHATest.php
index 10043504..3f523171 100644
--- a/tests/Predis/Command/ServerEvalSHATest.php
+++ b/tests/Predis/Command/ServerEvalSHATest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-scripting
diff --git a/tests/Predis/Command/ServerEvalTest.php b/tests/Predis/Command/ServerEvalTest.php
index 3fce4123..02a1b032 100644
--- a/tests/Predis/Command/ServerEvalTest.php
+++ b/tests/Predis/Command/ServerEvalTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-scripting
diff --git a/tests/Predis/Command/ServerFlushAllTest.php b/tests/Predis/Command/ServerFlushAllTest.php
index 7e0c8845..6122e5d3 100644
--- a/tests/Predis/Command/ServerFlushAllTest.php
+++ b/tests/Predis/Command/ServerFlushAllTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerFlushDatabaseTest.php b/tests/Predis/Command/ServerFlushDatabaseTest.php
index 861b0c4a..cb206f82 100644
--- a/tests/Predis/Command/ServerFlushDatabaseTest.php
+++ b/tests/Predis/Command/ServerFlushDatabaseTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerInfoTest.php b/tests/Predis/Command/ServerInfoTest.php
index 925880ea..20c36e87 100644
--- a/tests/Predis/Command/ServerInfoTest.php
+++ b/tests/Predis/Command/ServerInfoTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerInfoV26xTest.php b/tests/Predis/Command/ServerInfoV26xTest.php
index d50c69c4..a9a89b68 100644
--- a/tests/Predis/Command/ServerInfoV26xTest.php
+++ b/tests/Predis/Command/ServerInfoV26xTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerLastSaveTest.php b/tests/Predis/Command/ServerLastSaveTest.php
index b6e070cb..f0511271 100644
--- a/tests/Predis/Command/ServerLastSaveTest.php
+++ b/tests/Predis/Command/ServerLastSaveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerMonitorTest.php b/tests/Predis/Command/ServerMonitorTest.php
index bfae3337..01bd6aa6 100644
--- a/tests/Predis/Command/ServerMonitorTest.php
+++ b/tests/Predis/Command/ServerMonitorTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerObjectTest.php b/tests/Predis/Command/ServerObjectTest.php
index eb06cdc1..1e4572be 100644
--- a/tests/Predis/Command/ServerObjectTest.php
+++ b/tests/Predis/Command/ServerObjectTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerSaveTest.php b/tests/Predis/Command/ServerSaveTest.php
index ab93b4b1..fecf1db9 100644
--- a/tests/Predis/Command/ServerSaveTest.php
+++ b/tests/Predis/Command/ServerSaveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerScriptTest.php b/tests/Predis/Command/ServerScriptTest.php
index 3607e44b..f03ab781 100644
--- a/tests/Predis/Command/ServerScriptTest.php
+++ b/tests/Predis/Command/ServerScriptTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-scripting
diff --git a/tests/Predis/Command/ServerShutdownTest.php b/tests/Predis/Command/ServerShutdownTest.php
index 0eccba1d..ced931ee 100644
--- a/tests/Predis/Command/ServerShutdownTest.php
+++ b/tests/Predis/Command/ServerShutdownTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerSlaveOfTest.php b/tests/Predis/Command/ServerSlaveOfTest.php
index 13c643f0..f6932ff1 100644
--- a/tests/Predis/Command/ServerSlaveOfTest.php
+++ b/tests/Predis/Command/ServerSlaveOfTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/ServerSlowlogTest.php b/tests/Predis/Command/ServerSlowlogTest.php
index d557aced..1590a2e7 100644
--- a/tests/Predis/Command/ServerSlowlogTest.php
+++ b/tests/Predis/Command/ServerSlowlogTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * In order to support the output of SLOWLOG, the backend connection
  * must be able to parse nested multibulk replies deeper than 2 levels.
diff --git a/tests/Predis/Command/ServerTimeTest.php b/tests/Predis/Command/ServerTimeTest.php
index a4671e5c..41c583c4 100644
--- a/tests/Predis/Command/ServerTimeTest.php
+++ b/tests/Predis/Command/ServerTimeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-server
diff --git a/tests/Predis/Command/SetAddTest.php b/tests/Predis/Command/SetAddTest.php
index 85f540b1..012eb295 100644
--- a/tests/Predis/Command/SetAddTest.php
+++ b/tests/Predis/Command/SetAddTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetCardinalityTest.php b/tests/Predis/Command/SetCardinalityTest.php
index 9d40b2ad..4bc34ab8 100644
--- a/tests/Predis/Command/SetCardinalityTest.php
+++ b/tests/Predis/Command/SetCardinalityTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetDifferenceStoreTest.php b/tests/Predis/Command/SetDifferenceStoreTest.php
index 18737bda..440d9248 100644
--- a/tests/Predis/Command/SetDifferenceStoreTest.php
+++ b/tests/Predis/Command/SetDifferenceStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetDifferenceTest.php b/tests/Predis/Command/SetDifferenceTest.php
index 98c7ae4e..0fd326e8 100644
--- a/tests/Predis/Command/SetDifferenceTest.php
+++ b/tests/Predis/Command/SetDifferenceTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetIntersectionStoreTest.php b/tests/Predis/Command/SetIntersectionStoreTest.php
index 23c28988..30e27eda 100644
--- a/tests/Predis/Command/SetIntersectionStoreTest.php
+++ b/tests/Predis/Command/SetIntersectionStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetIntersectionTest.php b/tests/Predis/Command/SetIntersectionTest.php
index 2a284a53..b15fcdba 100644
--- a/tests/Predis/Command/SetIntersectionTest.php
+++ b/tests/Predis/Command/SetIntersectionTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetIsMemberTest.php b/tests/Predis/Command/SetIsMemberTest.php
index fa87c4cb..c85e8c10 100644
--- a/tests/Predis/Command/SetIsMemberTest.php
+++ b/tests/Predis/Command/SetIsMemberTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetMembersTest.php b/tests/Predis/Command/SetMembersTest.php
index d9e76006..b96a9bfb 100644
--- a/tests/Predis/Command/SetMembersTest.php
+++ b/tests/Predis/Command/SetMembersTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetMoveTest.php b/tests/Predis/Command/SetMoveTest.php
index 84bbf220..9ed4c2a7 100644
--- a/tests/Predis/Command/SetMoveTest.php
+++ b/tests/Predis/Command/SetMoveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetPopTest.php b/tests/Predis/Command/SetPopTest.php
index 720f7e71..f577cb6a 100644
--- a/tests/Predis/Command/SetPopTest.php
+++ b/tests/Predis/Command/SetPopTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetRandomMemberTest.php b/tests/Predis/Command/SetRandomMemberTest.php
index f799fb99..72137307 100644
--- a/tests/Predis/Command/SetRandomMemberTest.php
+++ b/tests/Predis/Command/SetRandomMemberTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetRemoveTest.php b/tests/Predis/Command/SetRemoveTest.php
index 91014496..5348d72f 100644
--- a/tests/Predis/Command/SetRemoveTest.php
+++ b/tests/Predis/Command/SetRemoveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetScanTest.php b/tests/Predis/Command/SetScanTest.php
index 8e43c105..64a4fa4f 100644
--- a/tests/Predis/Command/SetScanTest.php
+++ b/tests/Predis/Command/SetScanTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetUnionStoreTest.php b/tests/Predis/Command/SetUnionStoreTest.php
index 4a876c65..0f4083cb 100644
--- a/tests/Predis/Command/SetUnionStoreTest.php
+++ b/tests/Predis/Command/SetUnionStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/SetUnionTest.php b/tests/Predis/Command/SetUnionTest.php
index a2167641..6f889127 100644
--- a/tests/Predis/Command/SetUnionTest.php
+++ b/tests/Predis/Command/SetUnionTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-set
diff --git a/tests/Predis/Command/StringAppendTest.php b/tests/Predis/Command/StringAppendTest.php
index 993b62f2..8ed6822d 100644
--- a/tests/Predis/Command/StringAppendTest.php
+++ b/tests/Predis/Command/StringAppendTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringBitCountTest.php b/tests/Predis/Command/StringBitCountTest.php
index 4f6a4343..f765d203 100644
--- a/tests/Predis/Command/StringBitCountTest.php
+++ b/tests/Predis/Command/StringBitCountTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringBitOpTest.php b/tests/Predis/Command/StringBitOpTest.php
index 9d0f5632..8caf2acc 100644
--- a/tests/Predis/Command/StringBitOpTest.php
+++ b/tests/Predis/Command/StringBitOpTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringDecrementByTest.php b/tests/Predis/Command/StringDecrementByTest.php
index bdb072ab..6529ef59 100644
--- a/tests/Predis/Command/StringDecrementByTest.php
+++ b/tests/Predis/Command/StringDecrementByTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringDecrementTest.php b/tests/Predis/Command/StringDecrementTest.php
index 448c721d..bc4b14a1 100644
--- a/tests/Predis/Command/StringDecrementTest.php
+++ b/tests/Predis/Command/StringDecrementTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringGetBitTest.php b/tests/Predis/Command/StringGetBitTest.php
index 8b93a164..3afb735f 100644
--- a/tests/Predis/Command/StringGetBitTest.php
+++ b/tests/Predis/Command/StringGetBitTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringGetMultipleTest.php b/tests/Predis/Command/StringGetMultipleTest.php
index 6718be8d..ad009aac 100644
--- a/tests/Predis/Command/StringGetMultipleTest.php
+++ b/tests/Predis/Command/StringGetMultipleTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringGetRangeTest.php b/tests/Predis/Command/StringGetRangeTest.php
index 487ec51f..d7de14b4 100644
--- a/tests/Predis/Command/StringGetRangeTest.php
+++ b/tests/Predis/Command/StringGetRangeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringGetSetTest.php b/tests/Predis/Command/StringGetSetTest.php
index 969e22ba..b31a7a4a 100644
--- a/tests/Predis/Command/StringGetSetTest.php
+++ b/tests/Predis/Command/StringGetSetTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringGetTest.php b/tests/Predis/Command/StringGetTest.php
index 589fe115..75cb9810 100644
--- a/tests/Predis/Command/StringGetTest.php
+++ b/tests/Predis/Command/StringGetTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringIncrementByFloatTest.php b/tests/Predis/Command/StringIncrementByFloatTest.php
index efc445bf..47d884dd 100644
--- a/tests/Predis/Command/StringIncrementByFloatTest.php
+++ b/tests/Predis/Command/StringIncrementByFloatTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringIncrementByTest.php b/tests/Predis/Command/StringIncrementByTest.php
index 25f561bb..ef55f5a5 100644
--- a/tests/Predis/Command/StringIncrementByTest.php
+++ b/tests/Predis/Command/StringIncrementByTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringIncrementTest.php b/tests/Predis/Command/StringIncrementTest.php
index 61ad7afd..b6017c3a 100644
--- a/tests/Predis/Command/StringIncrementTest.php
+++ b/tests/Predis/Command/StringIncrementTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringPreciseSetExpireTest.php b/tests/Predis/Command/StringPreciseSetExpireTest.php
index 451f7502..ca2f18ca 100644
--- a/tests/Predis/Command/StringPreciseSetExpireTest.php
+++ b/tests/Predis/Command/StringPreciseSetExpireTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetBitTest.php b/tests/Predis/Command/StringSetBitTest.php
index 0fb8cd91..8dda640d 100644
--- a/tests/Predis/Command/StringSetBitTest.php
+++ b/tests/Predis/Command/StringSetBitTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetExpireTest.php b/tests/Predis/Command/StringSetExpireTest.php
index 190c4bca..769469b9 100644
--- a/tests/Predis/Command/StringSetExpireTest.php
+++ b/tests/Predis/Command/StringSetExpireTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetMultiplePreserveTest.php b/tests/Predis/Command/StringSetMultiplePreserveTest.php
index 11c973a3..dcb17809 100644
--- a/tests/Predis/Command/StringSetMultiplePreserveTest.php
+++ b/tests/Predis/Command/StringSetMultiplePreserveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetMultipleTest.php b/tests/Predis/Command/StringSetMultipleTest.php
index 72991d66..c1a7f0ee 100644
--- a/tests/Predis/Command/StringSetMultipleTest.php
+++ b/tests/Predis/Command/StringSetMultipleTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetPreserveTest.php b/tests/Predis/Command/StringSetPreserveTest.php
index e998d947..a77c5147 100644
--- a/tests/Predis/Command/StringSetPreserveTest.php
+++ b/tests/Predis/Command/StringSetPreserveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetRangeTest.php b/tests/Predis/Command/StringSetRangeTest.php
index ea2e06ca..eafb663a 100644
--- a/tests/Predis/Command/StringSetRangeTest.php
+++ b/tests/Predis/Command/StringSetRangeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSetTest.php b/tests/Predis/Command/StringSetTest.php
index e59508f9..61ca580c 100644
--- a/tests/Predis/Command/StringSetTest.php
+++ b/tests/Predis/Command/StringSetTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringStrlenTest.php b/tests/Predis/Command/StringStrlenTest.php
index 6ac166e8..c5c06c58 100644
--- a/tests/Predis/Command/StringStrlenTest.php
+++ b/tests/Predis/Command/StringStrlenTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-string
diff --git a/tests/Predis/Command/StringSubstrTest.php b/tests/Predis/Command/StringSubstrTest.php
index a5d42d27..42acf8c7 100644
--- a/tests/Predis/Command/StringSubstrTest.php
+++ b/tests/Predis/Command/StringSubstrTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * SUBSTR is actually the old name of GETRANGE in version of Redis <= 2.0.
  * This command should be considered obsolete and we will perform any kind
diff --git a/tests/Predis/Command/TransactionDiscardTest.php b/tests/Predis/Command/TransactionDiscardTest.php
index 90e8efc5..1b450c2f 100644
--- a/tests/Predis/Command/TransactionDiscardTest.php
+++ b/tests/Predis/Command/TransactionDiscardTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-transaction
diff --git a/tests/Predis/Command/TransactionExecTest.php b/tests/Predis/Command/TransactionExecTest.php
index bc248723..634bca54 100644
--- a/tests/Predis/Command/TransactionExecTest.php
+++ b/tests/Predis/Command/TransactionExecTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-transaction
diff --git a/tests/Predis/Command/TransactionMultiTest.php b/tests/Predis/Command/TransactionMultiTest.php
index d9c853b8..d7bde819 100644
--- a/tests/Predis/Command/TransactionMultiTest.php
+++ b/tests/Predis/Command/TransactionMultiTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-transaction
diff --git a/tests/Predis/Command/TransactionUnwatchTest.php b/tests/Predis/Command/TransactionUnwatchTest.php
index b86bb875..e437587c 100644
--- a/tests/Predis/Command/TransactionUnwatchTest.php
+++ b/tests/Predis/Command/TransactionUnwatchTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-transaction
diff --git a/tests/Predis/Command/TransactionWatchTest.php b/tests/Predis/Command/TransactionWatchTest.php
index 09fde252..494afbec 100644
--- a/tests/Predis/Command/TransactionWatchTest.php
+++ b/tests/Predis/Command/TransactionWatchTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-transaction
diff --git a/tests/Predis/Command/ZSetAddTest.php b/tests/Predis/Command/ZSetAddTest.php
index c843d00f..0a4280e2 100644
--- a/tests/Predis/Command/ZSetAddTest.php
+++ b/tests/Predis/Command/ZSetAddTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetCardinalityTest.php b/tests/Predis/Command/ZSetCardinalityTest.php
index 00bc5b43..2be63fa4 100644
--- a/tests/Predis/Command/ZSetCardinalityTest.php
+++ b/tests/Predis/Command/ZSetCardinalityTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetCountTest.php b/tests/Predis/Command/ZSetCountTest.php
index 9b6f41f8..03cc696d 100644
--- a/tests/Predis/Command/ZSetCountTest.php
+++ b/tests/Predis/Command/ZSetCountTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetIncrementByTest.php b/tests/Predis/Command/ZSetIncrementByTest.php
index 6d6c2604..ab65a911 100644
--- a/tests/Predis/Command/ZSetIncrementByTest.php
+++ b/tests/Predis/Command/ZSetIncrementByTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetIntersectionStoreTest.php b/tests/Predis/Command/ZSetIntersectionStoreTest.php
index ab021372..c2c8e1cd 100644
--- a/tests/Predis/Command/ZSetIntersectionStoreTest.php
+++ b/tests/Predis/Command/ZSetIntersectionStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
@@ -100,7 +98,6 @@ class ZSetIntersectionStoreTest extends PredisCommandTestCase
             'prefix:zset:destination', 2, 'prefix:zset1', 'prefix:zset2', 'WEIGHTS', 10, 100, 'AGGREGATE', 'sum'
         );
 
-
         $command = $this->getCommandWithArgumentsArray($arguments);
         $command->prefixKeys('prefix:');
 
diff --git a/tests/Predis/Command/ZSetRangeByScoreTest.php b/tests/Predis/Command/ZSetRangeByScoreTest.php
index 9639bb3d..6b37a124 100644
--- a/tests/Predis/Command/ZSetRangeByScoreTest.php
+++ b/tests/Predis/Command/ZSetRangeByScoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetRangeTest.php b/tests/Predis/Command/ZSetRangeTest.php
index 14fa3b88..1ea7a97c 100644
--- a/tests/Predis/Command/ZSetRangeTest.php
+++ b/tests/Predis/Command/ZSetRangeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetRankTest.php b/tests/Predis/Command/ZSetRankTest.php
index cf985ca9..87c4932c 100644
--- a/tests/Predis/Command/ZSetRankTest.php
+++ b/tests/Predis/Command/ZSetRankTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetRemoveRangeByRankTest.php b/tests/Predis/Command/ZSetRemoveRangeByRankTest.php
index 887f759b..9bdcc59b 100644
--- a/tests/Predis/Command/ZSetRemoveRangeByRankTest.php
+++ b/tests/Predis/Command/ZSetRemoveRangeByRankTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php b/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
index d9b5d3dc..193d72b4 100644
--- a/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
+++ b/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetRemoveTest.php b/tests/Predis/Command/ZSetRemoveTest.php
index 66e2607d..f419ddbc 100644
--- a/tests/Predis/Command/ZSetRemoveTest.php
+++ b/tests/Predis/Command/ZSetRemoveTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetReverseRangeByScoreTest.php b/tests/Predis/Command/ZSetReverseRangeByScoreTest.php
index fcd34819..1186ed3c 100644
--- a/tests/Predis/Command/ZSetReverseRangeByScoreTest.php
+++ b/tests/Predis/Command/ZSetReverseRangeByScoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetReverseRangeTest.php b/tests/Predis/Command/ZSetReverseRangeTest.php
index f8ac8b02..e83462bf 100644
--- a/tests/Predis/Command/ZSetReverseRangeTest.php
+++ b/tests/Predis/Command/ZSetReverseRangeTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetReverseRankTest.php b/tests/Predis/Command/ZSetReverseRankTest.php
index 13bf0851..d61cee54 100644
--- a/tests/Predis/Command/ZSetReverseRankTest.php
+++ b/tests/Predis/Command/ZSetReverseRankTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetScanTest.php b/tests/Predis/Command/ZSetScanTest.php
index 984b5b07..20e31ddc 100644
--- a/tests/Predis/Command/ZSetScanTest.php
+++ b/tests/Predis/Command/ZSetScanTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
@@ -129,8 +127,8 @@ class ZSetScanTest extends PredisCommandTestCase
         $response = $redis->zscan('key', 0);
 
         $this->assertSame(0, $response[0]);
-        $this->assertSame($expectedMembers, array_map(function($e) { return $e[0]; }, $response[1]));
-        $this->assertSame($expectedScores, array_map(function($e) { return $e[1]; }, $response[1]));
+        $this->assertSame($expectedMembers, array_map(function ($e) { return $e[0]; }, $response[1]));
+        $this->assertSame($expectedScores, array_map(function ($e) { return $e[1]; }, $response[1]));
     }
 
     /**
@@ -143,8 +141,8 @@ class ZSetScanTest extends PredisCommandTestCase
 
         $response = $redis->zscan('key', 0, 'MATCH', 'member:t*');
 
-        $this->assertSame(array('member:two', 'member:three'), array_map(function($e) { return $e[0]; }, $response[1]));
-        $this->assertSame(array(2.0, 3.0), array_map(function($e) { return $e[1]; }, $response[1]));
+        $this->assertSame(array('member:two', 'member:three'), array_map(function ($e) { return $e[0]; }, $response[1]));
+        $this->assertSame(array(2.0, 3.0), array_map(function ($e) { return $e[1]; }, $response[1]));
     }
 
     /**
diff --git a/tests/Predis/Command/ZSetScoreTest.php b/tests/Predis/Command/ZSetScoreTest.php
index 87bd93a3..b65f9f37 100644
--- a/tests/Predis/Command/ZSetScoreTest.php
+++ b/tests/Predis/Command/ZSetScoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/Command/ZSetUnionStoreTest.php b/tests/Predis/Command/ZSetUnionStoreTest.php
index 4c130f74..eb427867 100644
--- a/tests/Predis/Command/ZSetUnionStoreTest.php
+++ b/tests/Predis/Command/ZSetUnionStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PredisTestCase;
-
 /**
  * @group commands
  * @group realm-zset
diff --git a/tests/Predis/CommunicationExceptionTest.php b/tests/Predis/CommunicationExceptionTest.php
index 76f4d02e..057ea29c 100644
--- a/tests/Predis/CommunicationExceptionTest.php
+++ b/tests/Predis/CommunicationExceptionTest.php
@@ -78,7 +78,7 @@ class CommunicationExceptionTest extends PredisTestCase
     /**
      * Returns a mocked connection instance.
      *
-     * @param mixed $parameters Connection parameters.
+     * @param  mixed                     $parameters Connection parameters.
      * @return SingleConnectionInterface
      */
     protected function getMockedConnectionBase($parameters = null)
@@ -87,7 +87,7 @@ class CommunicationExceptionTest extends PredisTestCase
 
         if ($parameters === null) {
             $builder->disableOriginalConstructor();
-        } else if (!$parameters instanceof ConnectionParametersInterface) {
+        } elseif (!$parameters instanceof ConnectionParametersInterface) {
             $parameters = new ConnectionParameters($parameters);
         }
 
@@ -97,10 +97,10 @@ class CommunicationExceptionTest extends PredisTestCase
     /**
      * Returns a connection exception instance.
      *
-     * @param SingleConnectionInterface $message Connection instance.
-     * @param string $message Exception message.
-     * @param int $code Exception code.
-     * @param \Exception $inner Inner exception.
+     * @param  SingleConnectionInterface $message Connection instance.
+     * @param  string                    $message Exception message.
+     * @param  int                       $code    Exception code.
+     * @param  \Exception                $inner   Inner exception.
      * @return \Exception
      */
     protected function getException(SingleConnectionInterface $connection, $message, $code = 0, \Exception $inner = null)
diff --git a/tests/Predis/Connection/ComposableStreamConnectionTest.php b/tests/Predis/Connection/ComposableStreamConnectionTest.php
index 679f2d1d..59428014 100644
--- a/tests/Predis/Connection/ComposableStreamConnectionTest.php
+++ b/tests/Predis/Connection/ComposableStreamConnectionTest.php
@@ -11,9 +11,6 @@
 
 namespace Predis\Connection;
 
-use PredisTestCase;
-use Predis\Profile\ServerProfile;
-
 /**
  *
  */
diff --git a/tests/Predis/Connection/ConnectionFactoryTest.php b/tests/Predis/Connection/ConnectionFactoryTest.php
index 9fdeda82..809106fe 100644
--- a/tests/Predis/Connection/ConnectionFactoryTest.php
+++ b/tests/Predis/Connection/ConnectionFactoryTest.php
@@ -46,7 +46,6 @@ class ConnectionFactoryTest extends PredisTestCase
         $this->assertEquals($tcp->host, $parameters->host);
         $this->assertEquals($tcp->database, $parameters->database);
 
-
         $unix = new ConnectionParameters(array(
             'scheme' => 'unix',
             'path' => '/tmp/redis.sock',
diff --git a/tests/Predis/Connection/ConnectionParametersTest.php b/tests/Predis/Connection/ConnectionParametersTest.php
index aa72dda2..d31b32ad 100644
--- a/tests/Predis/Connection/ConnectionParametersTest.php
+++ b/tests/Predis/Connection/ConnectionParametersTest.php
@@ -242,7 +242,7 @@ class ParametersTest extends PredisTestCase
     /**
      * Returns an URI string representation of the specified connection parameters.
      *
-     * @param Array $parameters Array of connection parameters.
+     * @param  Array  $parameters Array of connection parameters.
      * @return String URI string.
      */
     protected function getParametersString(Array $parameters)
diff --git a/tests/Predis/Connection/MasterSlaveReplicationTest.php b/tests/Predis/Connection/MasterSlaveReplicationTest.php
index e90a100b..9d364c9c 100644
--- a/tests/Predis/Connection/MasterSlaveReplicationTest.php
+++ b/tests/Predis/Connection/MasterSlaveReplicationTest.php
@@ -495,6 +495,7 @@ class MasterSlaveReplicationTest extends PredisTestCase
 
         $replication->getReplicationStrategy()->setCommandReadOnly('exists', function ($cmd) {
             list($arg1) = $cmd->getArguments();
+
             return $arg1 === 'foo';
         });
 
@@ -568,7 +569,7 @@ class MasterSlaveReplicationTest extends PredisTestCase
     /**
      * Returns a base mocked connection from Predis\Connection\SingleConnectionInterface.
      *
-     * @param mixed $parameters Optional parameters.
+     * @param  mixed $parameters Optional parameters.
      * @return mixed
      */
     protected function getMockConnection($parameters = null)
diff --git a/tests/Predis/Connection/PhpiredisConnectionTest.php b/tests/Predis/Connection/PhpiredisConnectionTest.php
index 16f43074..9c4c69d7 100644
--- a/tests/Predis/Connection/PhpiredisConnectionTest.php
+++ b/tests/Predis/Connection/PhpiredisConnectionTest.php
@@ -11,9 +11,6 @@
 
 namespace Predis\Connection;
 
-use PredisTestCase;
-use Predis\Profile\ServerProfile;
-
 /**
  * @group ext-phpiredis
  */
diff --git a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
index 1d28f8da..7126f2a4 100644
--- a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
+++ b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
@@ -11,9 +11,6 @@
 
 namespace Predis\Connection;
 
-use PredisTestCase;
-use Predis\Profile\ServerProfile;
-
 /**
  * @group ext-phpiredis
  */
diff --git a/tests/Predis/Connection/PredisClusterTest.php b/tests/Predis/Connection/PredisClusterTest.php
index 88e3e2df..76a7e42d 100644
--- a/tests/Predis/Connection/PredisClusterTest.php
+++ b/tests/Predis/Connection/PredisClusterTest.php
@@ -380,7 +380,7 @@ class PredisClusterTest extends PredisTestCase
     /**
      * Returns a base mocked connection from Predis\Connection\SingleConnectionInterface.
      *
-     * @param mixed $parameters Optional parameters.
+     * @param  mixed $parameters Optional parameters.
      * @return mixed
      */
     protected function getMockConnection($parameters = null)
diff --git a/tests/Predis/Connection/RedisClusterTest.php b/tests/Predis/Connection/RedisClusterTest.php
index 489ca967..77dee671 100644
--- a/tests/Predis/Connection/RedisClusterTest.php
+++ b/tests/Predis/Connection/RedisClusterTest.php
@@ -548,7 +548,6 @@ class RedisClusterTest extends PredisTestCase
                     ->with($command)
                     ->will($this->onConsecutiveCalls('foobar', 'foobar'));
 
-
         $factory = $this->getMock('Predis\Connection\ConnectionFactory');
         $factory->expects($this->never())->method('create');
 
@@ -644,7 +643,7 @@ class RedisClusterTest extends PredisTestCase
     /**
      * Returns a base mocked connection from Predis\Connection\SingleConnectionInterface.
      *
-     * @param mixed $parameters Optional parameters.
+     * @param  mixed $parameters Optional parameters.
      * @return mixed
      */
     protected function getMockConnection($parameters = null)
diff --git a/tests/Predis/Connection/StreamConnectionTest.php b/tests/Predis/Connection/StreamConnectionTest.php
index cb6d5b61..f4ff2f6f 100644
--- a/tests/Predis/Connection/StreamConnectionTest.php
+++ b/tests/Predis/Connection/StreamConnectionTest.php
@@ -11,9 +11,6 @@
 
 namespace Predis\Connection;
 
-use PredisTestCase;
-use Predis\Profile\ServerProfile;
-
 /**
  *
  */
diff --git a/tests/Predis/Connection/WebdisConnectionTest.php b/tests/Predis/Connection/WebdisConnectionTest.php
index bb69c368..37f190f6 100644
--- a/tests/Predis/Connection/WebdisConnectionTest.php
+++ b/tests/Predis/Connection/WebdisConnectionTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Connection;
 
 use PredisTestCase;
-use Predis\Profile\ServerProfile;
 
 /**
  * @group ext-curl
@@ -170,7 +169,7 @@ class WebdisConnectionTest extends PredisTestCase
     /**
      * Returns a new instance of a connection instance.
      *
-     * @param array $parameters Additional connection parameters.
+     * @param  array            $parameters Additional connection parameters.
      * @return WebdisConnection
      */
     protected function getConnection(&$profile = null, Array $parameters = array())
diff --git a/tests/Predis/Pipeline/PipelineContextTest.php b/tests/Predis/Pipeline/PipelineContextTest.php
index 376d2d96..614129ae 100644
--- a/tests/Predis/Pipeline/PipelineContextTest.php
+++ b/tests/Predis/Pipeline/PipelineContextTest.php
@@ -388,8 +388,8 @@ class PipelineContextTest extends PredisTestCase
      * Returns a client instance connected to the specified Redis
      * server instance to perform integration tests.
      *
-     * @return array Additional connection parameters.
-     * @return array Additional client options.
+     * @return array  Additional connection parameters.
+     * @return array  Additional client options.
      * @return Client New client instance.
      */
     protected function getClient(array $parameters = array(), array $options = array())
diff --git a/tests/Predis/Pipeline/StandardExecutorTest.php b/tests/Predis/Pipeline/StandardExecutorTest.php
index 45ac7e5e..e7a2ea5e 100644
--- a/tests/Predis/Pipeline/StandardExecutorTest.php
+++ b/tests/Predis/Pipeline/StandardExecutorTest.php
@@ -116,7 +116,7 @@ class StandardExecutorTest extends PredisTestCase
      * Executes a test for the Predis\ResponseObjectInterface type.
      *
      * @param PipelineExecutorInterface $executor
-     * @param ResponseObjectInterface $response
+     * @param ResponseObjectInterface   $response
      */
     protected function simpleResponseObjectTest(PipelineExecutorInterface $executor, ResponseObjectInterface $response)
     {
diff --git a/tests/Predis/Protocol/Text/ResponseIntegerHandlerTest.php b/tests/Predis/Protocol/Text/ResponseIntegerHandlerTest.php
index 562784fd..e30f011d 100644
--- a/tests/Predis/Protocol/Text/ResponseIntegerHandlerTest.php
+++ b/tests/Predis/Protocol/Text/ResponseIntegerHandlerTest.php
@@ -12,7 +12,6 @@
 namespace Predis\Protocol\Text;
 
 use PredisTestCase;
-use Predis\ResponseQueued;
 
 /**
  *
diff --git a/tests/Predis/Protocol/Text/TextProtocolTest.php b/tests/Predis/Protocol/Text/TextProtocolTest.php
index 07e62c5d..b1d643c0 100644
--- a/tests/Predis/Protocol/Text/TextProtocolTest.php
+++ b/tests/Predis/Protocol/Text/TextProtocolTest.php
@@ -36,7 +36,6 @@ class TextProtocolTest extends PredisTestCase
                 ->method('getArguments')
                 ->will($this->returnValue(array()));
 
-
         $connection = $this->getMock('Predis\Connection\ComposableConnectionInterface');
 
         $connection->expects($this->once())
diff --git a/tests/Predis/PubSub/DispatcherLoopTest.php b/tests/Predis/PubSub/DispatcherLoopTest.php
index 1a7f8b88..e92c8940 100644
--- a/tests/Predis/PubSub/DispatcherLoopTest.php
+++ b/tests/Predis/PubSub/DispatcherLoopTest.php
@@ -13,7 +13,6 @@ namespace Predis\PubSub;
 
 use PredisTestCase;
 use Predis\Client;
-use Predis\Profile\ServerProfile;
 
 /**
  * @group realm-pubsub
diff --git a/tests/Predis/Replication/ReplicationStrategyTest.php b/tests/Predis/Replication/ReplicationStrategyTest.php
index e25d0860..ccb633f6 100644
--- a/tests/Predis/Replication/ReplicationStrategyTest.php
+++ b/tests/Predis/Replication/ReplicationStrategyTest.php
@@ -118,7 +118,6 @@ class ReplicationStrategyTest extends PredisTestCase
                 ->method('getId')
                 ->will($this->returnValue('CMDTEST'));
 
-
         $strategy->setCommandReadOnly('CMDTEST', true);
         $this->assertTrue($strategy->isReadOperation($command));
     }
@@ -135,7 +134,6 @@ class ReplicationStrategyTest extends PredisTestCase
                 ->method('getId')
                 ->will($this->returnValue('CMDTEST'));
 
-
         $strategy->setCommandReadOnly('CMDTEST', false);
         $this->assertFalse($strategy->isReadOperation($command));
 
@@ -235,7 +233,7 @@ class ReplicationStrategyTest extends PredisTestCase
     /**
      * Returns the list of expected supported commands.
      *
-     * @param string $type Optional type of command (based on its keys)
+     * @param  string $type Optional type of command (based on its keys)
      * @return array
      */
     protected function getExpectedCommands($type = null)
diff --git a/tests/Predis/Transaction/MultiExecContextTest.php b/tests/Predis/Transaction/MultiExecContextTest.php
index b0f93dff..54e20ec8 100644
--- a/tests/Predis/Transaction/MultiExecContextTest.php
+++ b/tests/Predis/Transaction/MultiExecContextTest.php
@@ -631,7 +631,7 @@ class MultiExecContextTest extends PredisTestCase
      * Returns a mocked instance of Predis\Connection\SingleConnectionInterface
      * usingthe specified callback to return values from executeCommand().
      *
-     * @param \Closure $executeCallback
+     * @param  \Closure                                     $executeCallback
      * @return \Predis\Connection\SingleConnectionInterface
      */
     protected function getMockedConnection($executeCallback)
@@ -649,7 +649,7 @@ class MultiExecContextTest extends PredisTestCase
      * the specified callback to return values from the executeCommand method
      * of the underlying connection.
      *
-     * @param \Closure $executeCallback
+     * @param  \Closure         $executeCallback
      * @return MultiExecContext
      */
     protected function getMockedTransaction($executeCallback, $options = array())
@@ -664,8 +664,8 @@ class MultiExecContextTest extends PredisTestCase
     /**
      * Returns a callback that emulates a server-side MULTI/EXEC transaction context.
      *
-     * @param array $expected Expected replies.
-     * @param array $commands Reference to an array that stores the whole flow of commands.
+     * @param  array    $expected Expected replies.
+     * @param  array    $commands Reference to an array that stores the whole flow of commands.
      * @return \Closure
      */
     protected function getExecuteCallback($expected = array(), &$commands = array(), &$cas = array())
@@ -706,6 +706,7 @@ class MultiExecContextTest extends PredisTestCase
                     if ($abort) {
                         $commands = $cas = array();
                         $abort = false;
+
                         return null;
                     }
 
@@ -745,11 +746,12 @@ class MultiExecContextTest extends PredisTestCase
      * Converts an array of instances of Predis\Command\CommandInterface and
      * returns an array containing their IDs.
      *
-     * @param array $commands List of commands instances.
+     * @param  array $commands List of commands instances.
      * @return array
      */
-    protected static function commandsToIDs($commands) {
-        return array_map(function($cmd) { return $cmd->getId(); }, $commands);
+    protected static function commandsToIDs($commands)
+    {
+        return array_map(function ($cmd) { return $cmd->getId(); }, $commands);
     }
 
     /**