diff --git a/bin/generate-command-test.php b/bin/generate-command-test.php
index 8613f7db..620d9324 100755
--- a/bin/generate-command-test.php
+++ b/bin/generate-command-test.php
@@ -175,7 +175,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-$realm
  */
-class $class extends CommandTestCase
+class $class extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/PHPUnit/CommandTestCase.php b/tests/PHPUnit/PredisCommandTestCase.php
similarity index 98%
rename from tests/PHPUnit/CommandTestCase.php
rename to tests/PHPUnit/PredisCommandTestCase.php
index 25d5b119..3017aaa2 100644
--- a/tests/PHPUnit/CommandTestCase.php
+++ b/tests/PHPUnit/PredisCommandTestCase.php
@@ -18,7 +18,7 @@ use Predis\Profile;
 /**
  *
  */
-abstract class CommandTestCase extends PredisTestCase
+abstract class PredisCommandTestCase extends PredisTestCase
 {
     /**
      * Returns the expected command.
diff --git a/tests/PHPUnit/ConnectionTestCase.php b/tests/PHPUnit/PredisConnectionTestCase.php
similarity index 99%
rename from tests/PHPUnit/ConnectionTestCase.php
rename to tests/PHPUnit/PredisConnectionTestCase.php
index ebadb014..ff12f03c 100644
--- a/tests/PHPUnit/ConnectionTestCase.php
+++ b/tests/PHPUnit/PredisConnectionTestCase.php
@@ -17,7 +17,7 @@ use Predis\Profile;
 /**
  * @group realm-connection
  */
-abstract class ConnectionTestCase extends PredisTestCase
+abstract class PredisConnectionTestCase extends PredisTestCase
 {
     /**
      * @group disconnected
diff --git a/tests/PHPUnit/DistributorTestCase.php b/tests/PHPUnit/PredisDistributorTestCase.php
similarity index 95%
rename from tests/PHPUnit/DistributorTestCase.php
rename to tests/PHPUnit/PredisDistributorTestCase.php
index b8aa257f..3e95a4c8 100644
--- a/tests/PHPUnit/DistributorTestCase.php
+++ b/tests/PHPUnit/PredisDistributorTestCase.php
@@ -16,7 +16,7 @@ use PredisTestCase;
 /**
  *
  */
-abstract class DistributorTestCase extends PredisTestCase
+abstract class PredisDistributorTestCase extends PredisTestCase
 {
     /**
      * Returns a new instance of the tested distributor.
diff --git a/tests/PHPUnit/RedisProfileTestCase.php b/tests/PHPUnit/PredisProfileTestCase.php
similarity index 99%
rename from tests/PHPUnit/RedisProfileTestCase.php
rename to tests/PHPUnit/PredisProfileTestCase.php
index d0b5dabe..2f83dc61 100644
--- a/tests/PHPUnit/RedisProfileTestCase.php
+++ b/tests/PHPUnit/PredisProfileTestCase.php
@@ -17,7 +17,7 @@ use Predis\Command\Processor\ProcessorChain;
 /**
  *
  */
-abstract class RedisProfileTestCase extends PredisTestCase
+abstract class PredisProfileTestCase extends PredisTestCase
 {
     /**
      * Returns a new instance of the tested profile.
diff --git a/tests/Predis/Cluster/Distributor/HashRingTest.php b/tests/Predis/Cluster/Distributor/HashRingTest.php
index 7a4f71dc..cedf1e1e 100644
--- a/tests/Predis/Cluster/Distributor/HashRingTest.php
+++ b/tests/Predis/Cluster/Distributor/HashRingTest.php
@@ -14,7 +14,7 @@ namespace Predis\Cluster\Distributor;
 /**
  * @todo To be improved.
  */
-class HashRingTest extends DistributorTestCase
+class HashRingTest extends PredisDistributorTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Cluster/Distributor/KetamaRingTest.php b/tests/Predis/Cluster/Distributor/KetamaRingTest.php
index def2b670..cb18b6ca 100644
--- a/tests/Predis/Cluster/Distributor/KetamaRingTest.php
+++ b/tests/Predis/Cluster/Distributor/KetamaRingTest.php
@@ -14,7 +14,7 @@ namespace Predis\Cluster\Distributor;
 /**
  * @todo To be improved.
  */
-class KetamaRingTest extends DistributorTestCase
+class KetamaRingTest extends PredisDistributorTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ConnectionAuthTest.php b/tests/Predis/Command/ConnectionAuthTest.php
index 3997fe98..6248a32a 100644
--- a/tests/Predis/Command/ConnectionAuthTest.php
+++ b/tests/Predis/Command/ConnectionAuthTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-connection
  */
-class ConnectionAuthTest extends CommandTestCase
+class ConnectionAuthTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ConnectionEchoTest.php b/tests/Predis/Command/ConnectionEchoTest.php
index ad729f3e..3d506c7a 100644
--- a/tests/Predis/Command/ConnectionEchoTest.php
+++ b/tests/Predis/Command/ConnectionEchoTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-connection
  */
-class ConnectionEchoTest extends CommandTestCase
+class ConnectionEchoTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ConnectionPingTest.php b/tests/Predis/Command/ConnectionPingTest.php
index 34faa377..725337da 100644
--- a/tests/Predis/Command/ConnectionPingTest.php
+++ b/tests/Predis/Command/ConnectionPingTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-connection
  */
-class ConnectionPingTest extends CommandTestCase
+class ConnectionPingTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ConnectionQuitTest.php b/tests/Predis/Command/ConnectionQuitTest.php
index 1e964384..1be47a54 100644
--- a/tests/Predis/Command/ConnectionQuitTest.php
+++ b/tests/Predis/Command/ConnectionQuitTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-connection
  */
-class ConnectionQuitTest extends CommandTestCase
+class ConnectionQuitTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ConnectionSelectTest.php b/tests/Predis/Command/ConnectionSelectTest.php
index 12930650..c7623f05 100644
--- a/tests/Predis/Command/ConnectionSelectTest.php
+++ b/tests/Predis/Command/ConnectionSelectTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-connection
  */
-class ConnectionSelectTest extends CommandTestCase
+class ConnectionSelectTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashDeleteTest.php b/tests/Predis/Command/HashDeleteTest.php
index a3b3e60a..67907898 100644
--- a/tests/Predis/Command/HashDeleteTest.php
+++ b/tests/Predis/Command/HashDeleteTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashDeleteTest extends CommandTestCase
+class HashDeleteTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashExistsTest.php b/tests/Predis/Command/HashExistsTest.php
index 4776794a..4ff40c0f 100644
--- a/tests/Predis/Command/HashExistsTest.php
+++ b/tests/Predis/Command/HashExistsTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashExistsTest extends CommandTestCase
+class HashExistsTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashGetAllTest.php b/tests/Predis/Command/HashGetAllTest.php
index 5e9335f3..c89155c3 100644
--- a/tests/Predis/Command/HashGetAllTest.php
+++ b/tests/Predis/Command/HashGetAllTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashGetAllTest extends CommandTestCase
+class HashGetAllTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashGetMultipleTest.php b/tests/Predis/Command/HashGetMultipleTest.php
index 7fa67bae..ea88b0d9 100644
--- a/tests/Predis/Command/HashGetMultipleTest.php
+++ b/tests/Predis/Command/HashGetMultipleTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashGetMultipleTest extends CommandTestCase
+class HashGetMultipleTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashGetTest.php b/tests/Predis/Command/HashGetTest.php
index 756f95eb..26862943 100644
--- a/tests/Predis/Command/HashGetTest.php
+++ b/tests/Predis/Command/HashGetTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashGetTest extends CommandTestCase
+class HashGetTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashIncrementByFloatTest.php b/tests/Predis/Command/HashIncrementByFloatTest.php
index 2a1ceae7..e2cda575 100644
--- a/tests/Predis/Command/HashIncrementByFloatTest.php
+++ b/tests/Predis/Command/HashIncrementByFloatTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashIncrementByFloatTest extends CommandTestCase
+class HashIncrementByFloatTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashIncrementByTest.php b/tests/Predis/Command/HashIncrementByTest.php
index b7df800b..eb82e94f 100644
--- a/tests/Predis/Command/HashIncrementByTest.php
+++ b/tests/Predis/Command/HashIncrementByTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashIncrementByTest extends CommandTestCase
+class HashIncrementByTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashKeysTest.php b/tests/Predis/Command/HashKeysTest.php
index f9094e24..dbefeb33 100644
--- a/tests/Predis/Command/HashKeysTest.php
+++ b/tests/Predis/Command/HashKeysTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashKeysTest extends CommandTestCase
+class HashKeysTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashLengthTest.php b/tests/Predis/Command/HashLengthTest.php
index 922bfb0b..ed21b175 100644
--- a/tests/Predis/Command/HashLengthTest.php
+++ b/tests/Predis/Command/HashLengthTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashLengthTest extends CommandTestCase
+class HashLengthTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashScanTest.php b/tests/Predis/Command/HashScanTest.php
index 03c3fbd3..52d20c60 100644
--- a/tests/Predis/Command/HashScanTest.php
+++ b/tests/Predis/Command/HashScanTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashScanTest extends CommandTestCase
+class HashScanTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashSetMultipleTest.php b/tests/Predis/Command/HashSetMultipleTest.php
index 9aa768da..ec64863b 100644
--- a/tests/Predis/Command/HashSetMultipleTest.php
+++ b/tests/Predis/Command/HashSetMultipleTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashSetMultipleTest extends CommandTestCase
+class HashSetMultipleTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashSetPreserveTest.php b/tests/Predis/Command/HashSetPreserveTest.php
index 56e654dc..7d17164e 100644
--- a/tests/Predis/Command/HashSetPreserveTest.php
+++ b/tests/Predis/Command/HashSetPreserveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashSetPreserveTest extends CommandTestCase
+class HashSetPreserveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashSetTest.php b/tests/Predis/Command/HashSetTest.php
index ccaf7c8d..35f1264a 100644
--- a/tests/Predis/Command/HashSetTest.php
+++ b/tests/Predis/Command/HashSetTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashSetTest extends CommandTestCase
+class HashSetTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/HashValuesTest.php b/tests/Predis/Command/HashValuesTest.php
index badd875c..b4e61c62 100644
--- a/tests/Predis/Command/HashValuesTest.php
+++ b/tests/Predis/Command/HashValuesTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-hash
  */
-class HashValuesTest extends CommandTestCase
+class HashValuesTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyDeleteTest.php b/tests/Predis/Command/KeyDeleteTest.php
index 2719ea51..e28009b6 100644
--- a/tests/Predis/Command/KeyDeleteTest.php
+++ b/tests/Predis/Command/KeyDeleteTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyDeleteTest extends CommandTestCase
+class KeyDeleteTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyDumpTest.php b/tests/Predis/Command/KeyDumpTest.php
index 9e11f3b3..020f74ab 100644
--- a/tests/Predis/Command/KeyDumpTest.php
+++ b/tests/Predis/Command/KeyDumpTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyDumpTest extends CommandTestCase
+class KeyDumpTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyExistsTest.php b/tests/Predis/Command/KeyExistsTest.php
index 5ab6fef3..d1fe63b0 100644
--- a/tests/Predis/Command/KeyExistsTest.php
+++ b/tests/Predis/Command/KeyExistsTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyExistsTest extends CommandTestCase
+class KeyExistsTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyExpireAtTest.php b/tests/Predis/Command/KeyExpireAtTest.php
index a2c91d89..6e5166ac 100644
--- a/tests/Predis/Command/KeyExpireAtTest.php
+++ b/tests/Predis/Command/KeyExpireAtTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyExpireAtTest extends CommandTestCase
+class KeyExpireAtTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyExpireTest.php b/tests/Predis/Command/KeyExpireTest.php
index d7f905fe..f219ce6a 100644
--- a/tests/Predis/Command/KeyExpireTest.php
+++ b/tests/Predis/Command/KeyExpireTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyExpireTest extends CommandTestCase
+class KeyExpireTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyKeysTest.php b/tests/Predis/Command/KeyKeysTest.php
index 495b562e..4d6c68e9 100644
--- a/tests/Predis/Command/KeyKeysTest.php
+++ b/tests/Predis/Command/KeyKeysTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyKeysTest extends CommandTestCase
+class KeyKeysTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyKeysV12xTest.php b/tests/Predis/Command/KeyKeysV12xTest.php
index a519db19..50a17ba3 100644
--- a/tests/Predis/Command/KeyKeysV12xTest.php
+++ b/tests/Predis/Command/KeyKeysV12xTest.php
@@ -19,7 +19,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyKeysV12xTest extends CommandTestCase
+class KeyKeysV12xTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyMoveTest.php b/tests/Predis/Command/KeyMoveTest.php
index aa9b1bea..448b3d8a 100644
--- a/tests/Predis/Command/KeyMoveTest.php
+++ b/tests/Predis/Command/KeyMoveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyMoveTest extends CommandTestCase
+class KeyMoveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyPersistTest.php b/tests/Predis/Command/KeyPersistTest.php
index 61b91b54..fc500dd9 100644
--- a/tests/Predis/Command/KeyPersistTest.php
+++ b/tests/Predis/Command/KeyPersistTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyPersistTest extends CommandTestCase
+class KeyPersistTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyPreciseExpireAtTest.php b/tests/Predis/Command/KeyPreciseExpireAtTest.php
index 970ed8be..077cd4b2 100644
--- a/tests/Predis/Command/KeyPreciseExpireAtTest.php
+++ b/tests/Predis/Command/KeyPreciseExpireAtTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyPreciseExpireAtTest extends CommandTestCase
+class KeyPreciseExpireAtTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyPreciseExpireTest.php b/tests/Predis/Command/KeyPreciseExpireTest.php
index 69e2eb3b..a7f057d7 100644
--- a/tests/Predis/Command/KeyPreciseExpireTest.php
+++ b/tests/Predis/Command/KeyPreciseExpireTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyPreciseExpireTest extends CommandTestCase
+class KeyPreciseExpireTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyPreciseTimeToLiveTest.php b/tests/Predis/Command/KeyPreciseTimeToLiveTest.php
index dbb188ba..1a50f874 100644
--- a/tests/Predis/Command/KeyPreciseTimeToLiveTest.php
+++ b/tests/Predis/Command/KeyPreciseTimeToLiveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyPreciseTimeToLiveTest extends CommandTestCase
+class KeyPreciseTimeToLiveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyRandomTest.php b/tests/Predis/Command/KeyRandomTest.php
index e8d33fa5..5a2dd880 100644
--- a/tests/Predis/Command/KeyRandomTest.php
+++ b/tests/Predis/Command/KeyRandomTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyRandomTest extends CommandTestCase
+class KeyRandomTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyRenamePreserveTest.php b/tests/Predis/Command/KeyRenamePreserveTest.php
index 3d3e25c9..a6ed04a0 100644
--- a/tests/Predis/Command/KeyRenamePreserveTest.php
+++ b/tests/Predis/Command/KeyRenamePreserveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyRenamePreserveTest extends CommandTestCase
+class KeyRenamePreserveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyRenameTest.php b/tests/Predis/Command/KeyRenameTest.php
index 23cc1c17..6041d236 100644
--- a/tests/Predis/Command/KeyRenameTest.php
+++ b/tests/Predis/Command/KeyRenameTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyRenameTest extends CommandTestCase
+class KeyRenameTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyRestoreTest.php b/tests/Predis/Command/KeyRestoreTest.php
index 4b674e08..fc2ac7f5 100644
--- a/tests/Predis/Command/KeyRestoreTest.php
+++ b/tests/Predis/Command/KeyRestoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyRestoreTest extends CommandTestCase
+class KeyRestoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyScanTest.php b/tests/Predis/Command/KeyScanTest.php
index c6104830..62d36d7a 100644
--- a/tests/Predis/Command/KeyScanTest.php
+++ b/tests/Predis/Command/KeyScanTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyScanTest extends CommandTestCase
+class KeyScanTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeySortTest.php b/tests/Predis/Command/KeySortTest.php
index 69906005..c6778ec2 100644
--- a/tests/Predis/Command/KeySortTest.php
+++ b/tests/Predis/Command/KeySortTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeySortTest extends CommandTestCase
+class KeySortTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyTimeToLiveTest.php b/tests/Predis/Command/KeyTimeToLiveTest.php
index 912b7b69..1618cb3d 100644
--- a/tests/Predis/Command/KeyTimeToLiveTest.php
+++ b/tests/Predis/Command/KeyTimeToLiveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyTimeToLiveTest extends CommandTestCase
+class KeyTimeToLiveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/KeyTypeTest.php b/tests/Predis/Command/KeyTypeTest.php
index 42b0688b..16f330bb 100644
--- a/tests/Predis/Command/KeyTypeTest.php
+++ b/tests/Predis/Command/KeyTypeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-key
  */
-class KeyTypeTest extends CommandTestCase
+class KeyTypeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListIndexTest.php b/tests/Predis/Command/ListIndexTest.php
index f5d54440..9fc6fd14 100644
--- a/tests/Predis/Command/ListIndexTest.php
+++ b/tests/Predis/Command/ListIndexTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListIndexTest extends CommandTestCase
+class ListIndexTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListInsertTest.php b/tests/Predis/Command/ListInsertTest.php
index 42207b7f..70d19952 100644
--- a/tests/Predis/Command/ListInsertTest.php
+++ b/tests/Predis/Command/ListInsertTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListInsertTest extends CommandTestCase
+class ListInsertTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListLengthTest.php b/tests/Predis/Command/ListLengthTest.php
index d0a308fc..96668acc 100644
--- a/tests/Predis/Command/ListLengthTest.php
+++ b/tests/Predis/Command/ListLengthTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListLengthTest extends CommandTestCase
+class ListLengthTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPopFirstBlockingTest.php b/tests/Predis/Command/ListPopFirstBlockingTest.php
index 02d787e0..c1dc5f15 100644
--- a/tests/Predis/Command/ListPopFirstBlockingTest.php
+++ b/tests/Predis/Command/ListPopFirstBlockingTest.php
@@ -17,7 +17,7 @@ namespace Predis\Command;
  * @todo Testing blocking pop operations against Redis using PHP is
  *       tricky, so we will skip these kind of tests for now.
  */
-class ListPopFirstBlockingTest extends CommandTestCase
+class ListPopFirstBlockingTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPopFirstTest.php b/tests/Predis/Command/ListPopFirstTest.php
index b74a7cf4..8307798b 100644
--- a/tests/Predis/Command/ListPopFirstTest.php
+++ b/tests/Predis/Command/ListPopFirstTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPopFirstTest extends CommandTestCase
+class ListPopFirstTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPopLastBlockingTest.php b/tests/Predis/Command/ListPopLastBlockingTest.php
index 6457ffc1..aed14aaf 100644
--- a/tests/Predis/Command/ListPopLastBlockingTest.php
+++ b/tests/Predis/Command/ListPopLastBlockingTest.php
@@ -17,7 +17,7 @@ namespace Predis\Command;
  * @todo Testing blocking pop operations against Redis using PHP is
  *       tricky, so we will skip these kind of tests for now.
  */
-class ListPopLastBlockingTest extends CommandTestCase
+class ListPopLastBlockingTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php b/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php
index 0a5666c4..fb0b71ab 100644
--- a/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php
+++ b/tests/Predis/Command/ListPopLastPushHeadBlockingTest.php
@@ -17,7 +17,7 @@ namespace Predis\Command;
  * @todo Testing blocking pop operations against Redis using PHP is
  *       tricky, so we will skip these kind of tests for now.
  */
-class ListPopLastPushHeadBlockingTest extends CommandTestCase
+class ListPopLastPushHeadBlockingTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPopLastPushHeadTest.php b/tests/Predis/Command/ListPopLastPushHeadTest.php
index b87a7791..c555a50d 100644
--- a/tests/Predis/Command/ListPopLastPushHeadTest.php
+++ b/tests/Predis/Command/ListPopLastPushHeadTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPopLastPushHeadTest extends CommandTestCase
+class ListPopLastPushHeadTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPopLastTest.php b/tests/Predis/Command/ListPopLastTest.php
index fd933145..d7a250aa 100644
--- a/tests/Predis/Command/ListPopLastTest.php
+++ b/tests/Predis/Command/ListPopLastTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPopLastTest extends CommandTestCase
+class ListPopLastTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPushHeadTest.php b/tests/Predis/Command/ListPushHeadTest.php
index 6b42db4d..edd409e1 100644
--- a/tests/Predis/Command/ListPushHeadTest.php
+++ b/tests/Predis/Command/ListPushHeadTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPushHeadTest extends CommandTestCase
+class ListPushHeadTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPushHeadXTest.php b/tests/Predis/Command/ListPushHeadXTest.php
index d8c4d4dd..7f0c5a05 100644
--- a/tests/Predis/Command/ListPushHeadXTest.php
+++ b/tests/Predis/Command/ListPushHeadXTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPushHeadXTest extends CommandTestCase
+class ListPushHeadXTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPushTailTest.php b/tests/Predis/Command/ListPushTailTest.php
index 2b7208f9..d1ca8144 100644
--- a/tests/Predis/Command/ListPushTailTest.php
+++ b/tests/Predis/Command/ListPushTailTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPushTailTest extends CommandTestCase
+class ListPushTailTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListPushTailXTest.php b/tests/Predis/Command/ListPushTailXTest.php
index 395d029e..db67add5 100644
--- a/tests/Predis/Command/ListPushTailXTest.php
+++ b/tests/Predis/Command/ListPushTailXTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListPushTailXTest extends CommandTestCase
+class ListPushTailXTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListRangeTest.php b/tests/Predis/Command/ListRangeTest.php
index 8a597935..1422d1e8 100644
--- a/tests/Predis/Command/ListRangeTest.php
+++ b/tests/Predis/Command/ListRangeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListRangeTest extends CommandTestCase
+class ListRangeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListRemoveTest.php b/tests/Predis/Command/ListRemoveTest.php
index 985a4bd7..cd9d90e1 100644
--- a/tests/Predis/Command/ListRemoveTest.php
+++ b/tests/Predis/Command/ListRemoveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListRemoveTest extends CommandTestCase
+class ListRemoveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListSetTest.php b/tests/Predis/Command/ListSetTest.php
index e8f51975..ed1bb7b2 100644
--- a/tests/Predis/Command/ListSetTest.php
+++ b/tests/Predis/Command/ListSetTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListSetTest extends CommandTestCase
+class ListSetTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ListTrimTest.php b/tests/Predis/Command/ListTrimTest.php
index 9abd2632..53af2b61 100644
--- a/tests/Predis/Command/ListTrimTest.php
+++ b/tests/Predis/Command/ListTrimTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-list
  */
-class ListTrimTest extends CommandTestCase
+class ListTrimTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/PubSubPublishTest.php b/tests/Predis/Command/PubSubPublishTest.php
index 57b79f51..a6369ac2 100644
--- a/tests/Predis/Command/PubSubPublishTest.php
+++ b/tests/Predis/Command/PubSubPublishTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-pubsub
  */
-class PubSubPublishTest extends CommandTestCase
+class PubSubPublishTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/PubSubPubsubTest.php b/tests/Predis/Command/PubSubPubsubTest.php
index 213fb330..a341becf 100644
--- a/tests/Predis/Command/PubSubPubsubTest.php
+++ b/tests/Predis/Command/PubSubPubsubTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-pubsub
  */
-class PubSubPubsubTest extends CommandTestCase
+class PubSubPubsubTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/PubSubSubscribeByPatternTest.php b/tests/Predis/Command/PubSubSubscribeByPatternTest.php
index e87e8a2c..adaacffd 100644
--- a/tests/Predis/Command/PubSubSubscribeByPatternTest.php
+++ b/tests/Predis/Command/PubSubSubscribeByPatternTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-pubsub
  */
-class PubSubSubscribeByPatternTest extends CommandTestCase
+class PubSubSubscribeByPatternTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/PubSubSubscribeTest.php b/tests/Predis/Command/PubSubSubscribeTest.php
index 9e41131d..f4eaf2bd 100644
--- a/tests/Predis/Command/PubSubSubscribeTest.php
+++ b/tests/Predis/Command/PubSubSubscribeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-pubsub
  */
-class PubSubSubscribeTest extends CommandTestCase
+class PubSubSubscribeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php b/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php
index 18f6cc30..dfdea426 100644
--- a/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php
+++ b/tests/Predis/Command/PubSubUnsubscribeByPatternTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-pubsub
  */
-class PubSubUnsubscribeByPatternTest extends CommandTestCase
+class PubSubUnsubscribeByPatternTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/PubSubUnsubscribeTest.php b/tests/Predis/Command/PubSubUnsubscribeTest.php
index 5132f3bd..7c2a4002 100644
--- a/tests/Predis/Command/PubSubUnsubscribeTest.php
+++ b/tests/Predis/Command/PubSubUnsubscribeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-pubsub
  */
-class PubSubUnsubscribeTest extends CommandTestCase
+class PubSubUnsubscribeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php b/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php
index 4e03b935..9706f112 100644
--- a/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php
+++ b/tests/Predis/Command/ServerBackgroundRewriteAOFTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerBackgroundRewriteAOFTest extends CommandTestCase
+class ServerBackgroundRewriteAOFTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerBackgroundSaveTest.php b/tests/Predis/Command/ServerBackgroundSaveTest.php
index e275563a..54d3b2fd 100644
--- a/tests/Predis/Command/ServerBackgroundSaveTest.php
+++ b/tests/Predis/Command/ServerBackgroundSaveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerBackgroundSaveTest extends CommandTestCase
+class ServerBackgroundSaveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerClientTest.php b/tests/Predis/Command/ServerClientTest.php
index c23c11eb..bd97a858 100644
--- a/tests/Predis/Command/ServerClientTest.php
+++ b/tests/Predis/Command/ServerClientTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerClientTest extends CommandTestCase
+class ServerClientTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerConfigTest.php b/tests/Predis/Command/ServerConfigTest.php
index 8fb29c24..368754a9 100644
--- a/tests/Predis/Command/ServerConfigTest.php
+++ b/tests/Predis/Command/ServerConfigTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerConfigTest extends CommandTestCase
+class ServerConfigTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerDatabaseSizeTest.php b/tests/Predis/Command/ServerDatabaseSizeTest.php
index 9cfc3803..b984e373 100644
--- a/tests/Predis/Command/ServerDatabaseSizeTest.php
+++ b/tests/Predis/Command/ServerDatabaseSizeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerDatabaseSizeTest extends CommandTestCase
+class ServerDatabaseSizeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerEvalSHATest.php b/tests/Predis/Command/ServerEvalSHATest.php
index 2446ca57..bbda8efc 100644
--- a/tests/Predis/Command/ServerEvalSHATest.php
+++ b/tests/Predis/Command/ServerEvalSHATest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-scripting
  */
-class ServerEvalSHATest extends CommandTestCase
+class ServerEvalSHATest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerEvalTest.php b/tests/Predis/Command/ServerEvalTest.php
index ae8d7765..f505ff68 100644
--- a/tests/Predis/Command/ServerEvalTest.php
+++ b/tests/Predis/Command/ServerEvalTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-scripting
  */
-class ServerEvalTest extends CommandTestCase
+class ServerEvalTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerFlushAllTest.php b/tests/Predis/Command/ServerFlushAllTest.php
index b455f4dc..6122e5d3 100644
--- a/tests/Predis/Command/ServerFlushAllTest.php
+++ b/tests/Predis/Command/ServerFlushAllTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerFlushAllTest extends CommandTestCase
+class ServerFlushAllTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerFlushDatabaseTest.php b/tests/Predis/Command/ServerFlushDatabaseTest.php
index 888d041e..cb206f82 100644
--- a/tests/Predis/Command/ServerFlushDatabaseTest.php
+++ b/tests/Predis/Command/ServerFlushDatabaseTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerFlushDatabaseTest extends CommandTestCase
+class ServerFlushDatabaseTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerInfoTest.php b/tests/Predis/Command/ServerInfoTest.php
index 74cf2de1..20c36e87 100644
--- a/tests/Predis/Command/ServerInfoTest.php
+++ b/tests/Predis/Command/ServerInfoTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerInfoTest extends CommandTestCase
+class ServerInfoTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerInfoV26xTest.php b/tests/Predis/Command/ServerInfoV26xTest.php
index 4264445d..a9a89b68 100644
--- a/tests/Predis/Command/ServerInfoV26xTest.php
+++ b/tests/Predis/Command/ServerInfoV26xTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerInfoV26xTest extends CommandTestCase
+class ServerInfoV26xTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerLastSaveTest.php b/tests/Predis/Command/ServerLastSaveTest.php
index 47a7f7b6..f0511271 100644
--- a/tests/Predis/Command/ServerLastSaveTest.php
+++ b/tests/Predis/Command/ServerLastSaveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerLastSaveTest extends CommandTestCase
+class ServerLastSaveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerMonitorTest.php b/tests/Predis/Command/ServerMonitorTest.php
index 5fa5ab69..01bd6aa6 100644
--- a/tests/Predis/Command/ServerMonitorTest.php
+++ b/tests/Predis/Command/ServerMonitorTest.php
@@ -16,7 +16,7 @@ namespace Predis\Command;
  * @group realm-server
  * @group realm-monitor
  */
-class ServerMonitorTest extends CommandTestCase
+class ServerMonitorTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerObjectTest.php b/tests/Predis/Command/ServerObjectTest.php
index 7457ead7..58ed8f63 100644
--- a/tests/Predis/Command/ServerObjectTest.php
+++ b/tests/Predis/Command/ServerObjectTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerObjectTest extends CommandTestCase
+class ServerObjectTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerSaveTest.php b/tests/Predis/Command/ServerSaveTest.php
index 9e923f8c..fecf1db9 100644
--- a/tests/Predis/Command/ServerSaveTest.php
+++ b/tests/Predis/Command/ServerSaveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerSaveTest extends CommandTestCase
+class ServerSaveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerScriptTest.php b/tests/Predis/Command/ServerScriptTest.php
index 0b8b839a..5db342d7 100644
--- a/tests/Predis/Command/ServerScriptTest.php
+++ b/tests/Predis/Command/ServerScriptTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-scripting
  */
-class ServerScriptTest extends CommandTestCase
+class ServerScriptTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerSentinelTest.php b/tests/Predis/Command/ServerSentinelTest.php
index ea81da14..e7412b90 100644
--- a/tests/Predis/Command/ServerSentinelTest.php
+++ b/tests/Predis/Command/ServerSentinelTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerSentinelTest extends CommandTestCase
+class ServerSentinelTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerShutdownTest.php b/tests/Predis/Command/ServerShutdownTest.php
index 3accd559..ced931ee 100644
--- a/tests/Predis/Command/ServerShutdownTest.php
+++ b/tests/Predis/Command/ServerShutdownTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerShutdownTest extends CommandTestCase
+class ServerShutdownTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerSlaveOfTest.php b/tests/Predis/Command/ServerSlaveOfTest.php
index a132540d..f6932ff1 100644
--- a/tests/Predis/Command/ServerSlaveOfTest.php
+++ b/tests/Predis/Command/ServerSlaveOfTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerSlaveOfTest extends CommandTestCase
+class ServerSlaveOfTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerSlowlogTest.php b/tests/Predis/Command/ServerSlowlogTest.php
index abfb5270..2a63fb64 100644
--- a/tests/Predis/Command/ServerSlowlogTest.php
+++ b/tests/Predis/Command/ServerSlowlogTest.php
@@ -18,7 +18,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerSlowlogTest extends CommandTestCase
+class ServerSlowlogTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ServerTimeTest.php b/tests/Predis/Command/ServerTimeTest.php
index 492fd94d..41c583c4 100644
--- a/tests/Predis/Command/ServerTimeTest.php
+++ b/tests/Predis/Command/ServerTimeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-server
  */
-class ServerTimeTest extends CommandTestCase
+class ServerTimeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetAddTest.php b/tests/Predis/Command/SetAddTest.php
index 9131e480..340c7e8d 100644
--- a/tests/Predis/Command/SetAddTest.php
+++ b/tests/Predis/Command/SetAddTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetAddTest extends CommandTestCase
+class SetAddTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetCardinalityTest.php b/tests/Predis/Command/SetCardinalityTest.php
index c0bf2da0..72a0e35b 100644
--- a/tests/Predis/Command/SetCardinalityTest.php
+++ b/tests/Predis/Command/SetCardinalityTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetCardinalityTest extends CommandTestCase
+class SetCardinalityTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetDifferenceStoreTest.php b/tests/Predis/Command/SetDifferenceStoreTest.php
index 7682e6fe..d8756a71 100644
--- a/tests/Predis/Command/SetDifferenceStoreTest.php
+++ b/tests/Predis/Command/SetDifferenceStoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetDifferenceStoreTest extends CommandTestCase
+class SetDifferenceStoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetDifferenceTest.php b/tests/Predis/Command/SetDifferenceTest.php
index a9bfc228..a7617953 100644
--- a/tests/Predis/Command/SetDifferenceTest.php
+++ b/tests/Predis/Command/SetDifferenceTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetDifferenceTest extends CommandTestCase
+class SetDifferenceTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetIntersectionStoreTest.php b/tests/Predis/Command/SetIntersectionStoreTest.php
index 0ee5e15d..108f1c88 100644
--- a/tests/Predis/Command/SetIntersectionStoreTest.php
+++ b/tests/Predis/Command/SetIntersectionStoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetIntersectionStoreTest extends CommandTestCase
+class SetIntersectionStoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetIntersectionTest.php b/tests/Predis/Command/SetIntersectionTest.php
index 08eee08a..765fbf95 100644
--- a/tests/Predis/Command/SetIntersectionTest.php
+++ b/tests/Predis/Command/SetIntersectionTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetIntersectionTest extends CommandTestCase
+class SetIntersectionTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetIsMemberTest.php b/tests/Predis/Command/SetIsMemberTest.php
index ed0f4d8d..7e296567 100644
--- a/tests/Predis/Command/SetIsMemberTest.php
+++ b/tests/Predis/Command/SetIsMemberTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetIsMemberTest extends CommandTestCase
+class SetIsMemberTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetMembersTest.php b/tests/Predis/Command/SetMembersTest.php
index cb1d86ed..f5bac241 100644
--- a/tests/Predis/Command/SetMembersTest.php
+++ b/tests/Predis/Command/SetMembersTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetMembersTest extends CommandTestCase
+class SetMembersTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetMoveTest.php b/tests/Predis/Command/SetMoveTest.php
index e4378c7a..aff46fc3 100644
--- a/tests/Predis/Command/SetMoveTest.php
+++ b/tests/Predis/Command/SetMoveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetMoveTest extends CommandTestCase
+class SetMoveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetPopTest.php b/tests/Predis/Command/SetPopTest.php
index 96b042e5..3a4f460c 100644
--- a/tests/Predis/Command/SetPopTest.php
+++ b/tests/Predis/Command/SetPopTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetPopTest extends CommandTestCase
+class SetPopTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetRandomMemberTest.php b/tests/Predis/Command/SetRandomMemberTest.php
index e92af103..fec42e18 100644
--- a/tests/Predis/Command/SetRandomMemberTest.php
+++ b/tests/Predis/Command/SetRandomMemberTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetRandomMemberTest extends CommandTestCase
+class SetRandomMemberTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetRemoveTest.php b/tests/Predis/Command/SetRemoveTest.php
index 0a5ae1db..2b90db43 100644
--- a/tests/Predis/Command/SetRemoveTest.php
+++ b/tests/Predis/Command/SetRemoveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetRemoveTest extends CommandTestCase
+class SetRemoveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetScanTest.php b/tests/Predis/Command/SetScanTest.php
index 457a05aa..5cfab8f5 100644
--- a/tests/Predis/Command/SetScanTest.php
+++ b/tests/Predis/Command/SetScanTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetScanTest extends CommandTestCase
+class SetScanTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetUnionStoreTest.php b/tests/Predis/Command/SetUnionStoreTest.php
index b55d03c2..8f3aeb4c 100644
--- a/tests/Predis/Command/SetUnionStoreTest.php
+++ b/tests/Predis/Command/SetUnionStoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetUnionStoreTest extends CommandTestCase
+class SetUnionStoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/SetUnionTest.php b/tests/Predis/Command/SetUnionTest.php
index aa4b3f0e..cb181e89 100644
--- a/tests/Predis/Command/SetUnionTest.php
+++ b/tests/Predis/Command/SetUnionTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-set
  */
-class SetUnionTest extends CommandTestCase
+class SetUnionTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringAppendTest.php b/tests/Predis/Command/StringAppendTest.php
index c0c3739e..aaa958b8 100644
--- a/tests/Predis/Command/StringAppendTest.php
+++ b/tests/Predis/Command/StringAppendTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringAppendTest extends CommandTestCase
+class StringAppendTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringBitCountTest.php b/tests/Predis/Command/StringBitCountTest.php
index ddda1e87..d84c242c 100644
--- a/tests/Predis/Command/StringBitCountTest.php
+++ b/tests/Predis/Command/StringBitCountTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringBitCountTest extends CommandTestCase
+class StringBitCountTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringBitOpTest.php b/tests/Predis/Command/StringBitOpTest.php
index faf6f896..f22b9ba8 100644
--- a/tests/Predis/Command/StringBitOpTest.php
+++ b/tests/Predis/Command/StringBitOpTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringBitOpTest extends CommandTestCase
+class StringBitOpTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringDecrementByTest.php b/tests/Predis/Command/StringDecrementByTest.php
index e21905b7..97c0b0a0 100644
--- a/tests/Predis/Command/StringDecrementByTest.php
+++ b/tests/Predis/Command/StringDecrementByTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringDecrementByTest extends CommandTestCase
+class StringDecrementByTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringDecrementTest.php b/tests/Predis/Command/StringDecrementTest.php
index 8e6981d6..623e015c 100644
--- a/tests/Predis/Command/StringDecrementTest.php
+++ b/tests/Predis/Command/StringDecrementTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringDecrementTest extends CommandTestCase
+class StringDecrementTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringGetBitTest.php b/tests/Predis/Command/StringGetBitTest.php
index c0dcfa0c..786f580f 100644
--- a/tests/Predis/Command/StringGetBitTest.php
+++ b/tests/Predis/Command/StringGetBitTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringGetBitTest extends CommandTestCase
+class StringGetBitTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringGetMultipleTest.php b/tests/Predis/Command/StringGetMultipleTest.php
index 81913f22..412dfad3 100644
--- a/tests/Predis/Command/StringGetMultipleTest.php
+++ b/tests/Predis/Command/StringGetMultipleTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringGetMultipleTest extends CommandTestCase
+class StringGetMultipleTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringGetRangeTest.php b/tests/Predis/Command/StringGetRangeTest.php
index 697ad338..2dae10c1 100644
--- a/tests/Predis/Command/StringGetRangeTest.php
+++ b/tests/Predis/Command/StringGetRangeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringGetRangeTest extends CommandTestCase
+class StringGetRangeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringGetSetTest.php b/tests/Predis/Command/StringGetSetTest.php
index b98a946c..a472c802 100644
--- a/tests/Predis/Command/StringGetSetTest.php
+++ b/tests/Predis/Command/StringGetSetTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringGetSetTest extends CommandTestCase
+class StringGetSetTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringGetTest.php b/tests/Predis/Command/StringGetTest.php
index 38f5cffa..523145ef 100644
--- a/tests/Predis/Command/StringGetTest.php
+++ b/tests/Predis/Command/StringGetTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringGetTest extends CommandTestCase
+class StringGetTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringIncrementByFloatTest.php b/tests/Predis/Command/StringIncrementByFloatTest.php
index 427ba311..1c2e0314 100644
--- a/tests/Predis/Command/StringIncrementByFloatTest.php
+++ b/tests/Predis/Command/StringIncrementByFloatTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringIncrementByFloatTest extends CommandTestCase
+class StringIncrementByFloatTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringIncrementByTest.php b/tests/Predis/Command/StringIncrementByTest.php
index 320c5ebc..12c51a0c 100644
--- a/tests/Predis/Command/StringIncrementByTest.php
+++ b/tests/Predis/Command/StringIncrementByTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringIncrementByTest extends CommandTestCase
+class StringIncrementByTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringIncrementTest.php b/tests/Predis/Command/StringIncrementTest.php
index 682cd75f..2a6a959f 100644
--- a/tests/Predis/Command/StringIncrementTest.php
+++ b/tests/Predis/Command/StringIncrementTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringIncrementTest extends CommandTestCase
+class StringIncrementTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringPreciseSetExpireTest.php b/tests/Predis/Command/StringPreciseSetExpireTest.php
index d6c52752..c064348d 100644
--- a/tests/Predis/Command/StringPreciseSetExpireTest.php
+++ b/tests/Predis/Command/StringPreciseSetExpireTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringPreciseSetExpireTest extends CommandTestCase
+class StringPreciseSetExpireTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetBitTest.php b/tests/Predis/Command/StringSetBitTest.php
index 0cde85a2..b1df2feb 100644
--- a/tests/Predis/Command/StringSetBitTest.php
+++ b/tests/Predis/Command/StringSetBitTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetBitTest extends CommandTestCase
+class StringSetBitTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetExpireTest.php b/tests/Predis/Command/StringSetExpireTest.php
index 63fac431..b0a0afa9 100644
--- a/tests/Predis/Command/StringSetExpireTest.php
+++ b/tests/Predis/Command/StringSetExpireTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetExpireTest extends CommandTestCase
+class StringSetExpireTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetMultiplePreserveTest.php b/tests/Predis/Command/StringSetMultiplePreserveTest.php
index 31851d4f..f3a768f0 100644
--- a/tests/Predis/Command/StringSetMultiplePreserveTest.php
+++ b/tests/Predis/Command/StringSetMultiplePreserveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetMultiplePreserveTest extends CommandTestCase
+class StringSetMultiplePreserveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetMultipleTest.php b/tests/Predis/Command/StringSetMultipleTest.php
index b4cd235b..40abdd99 100644
--- a/tests/Predis/Command/StringSetMultipleTest.php
+++ b/tests/Predis/Command/StringSetMultipleTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetMultipleTest extends CommandTestCase
+class StringSetMultipleTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetPreserveTest.php b/tests/Predis/Command/StringSetPreserveTest.php
index d83a8d2e..60d61987 100644
--- a/tests/Predis/Command/StringSetPreserveTest.php
+++ b/tests/Predis/Command/StringSetPreserveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetPreserveTest extends CommandTestCase
+class StringSetPreserveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetRangeTest.php b/tests/Predis/Command/StringSetRangeTest.php
index 32da0f47..c9f8363c 100644
--- a/tests/Predis/Command/StringSetRangeTest.php
+++ b/tests/Predis/Command/StringSetRangeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetRangeTest extends CommandTestCase
+class StringSetRangeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSetTest.php b/tests/Predis/Command/StringSetTest.php
index ea19d90b..78f9d6bd 100644
--- a/tests/Predis/Command/StringSetTest.php
+++ b/tests/Predis/Command/StringSetTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSetTest extends CommandTestCase
+class StringSetTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringStrlenTest.php b/tests/Predis/Command/StringStrlenTest.php
index 12e5447d..b617e3cb 100644
--- a/tests/Predis/Command/StringStrlenTest.php
+++ b/tests/Predis/Command/StringStrlenTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringStrlenTest extends CommandTestCase
+class StringStrlenTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/StringSubstrTest.php b/tests/Predis/Command/StringSubstrTest.php
index d92b2080..81c3824b 100644
--- a/tests/Predis/Command/StringSubstrTest.php
+++ b/tests/Predis/Command/StringSubstrTest.php
@@ -19,7 +19,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-string
  */
-class StringSubstrTest extends CommandTestCase
+class StringSubstrTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/TransactionDiscardTest.php b/tests/Predis/Command/TransactionDiscardTest.php
index e614774b..c26a15c5 100644
--- a/tests/Predis/Command/TransactionDiscardTest.php
+++ b/tests/Predis/Command/TransactionDiscardTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-transaction
  */
-class TransactionDiscardTest extends CommandTestCase
+class TransactionDiscardTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/TransactionExecTest.php b/tests/Predis/Command/TransactionExecTest.php
index dd165374..7ed1324b 100644
--- a/tests/Predis/Command/TransactionExecTest.php
+++ b/tests/Predis/Command/TransactionExecTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-transaction
  */
-class TransactionExecTest extends CommandTestCase
+class TransactionExecTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/TransactionMultiTest.php b/tests/Predis/Command/TransactionMultiTest.php
index ff2dac49..d2b218dc 100644
--- a/tests/Predis/Command/TransactionMultiTest.php
+++ b/tests/Predis/Command/TransactionMultiTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-transaction
  */
-class TransactionMultiTest extends CommandTestCase
+class TransactionMultiTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/TransactionUnwatchTest.php b/tests/Predis/Command/TransactionUnwatchTest.php
index 08c38eed..5bd6ec52 100644
--- a/tests/Predis/Command/TransactionUnwatchTest.php
+++ b/tests/Predis/Command/TransactionUnwatchTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-transaction
  */
-class TransactionUnwatchTest extends CommandTestCase
+class TransactionUnwatchTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/TransactionWatchTest.php b/tests/Predis/Command/TransactionWatchTest.php
index 45673f13..71576370 100644
--- a/tests/Predis/Command/TransactionWatchTest.php
+++ b/tests/Predis/Command/TransactionWatchTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-transaction
  */
-class TransactionWatchTest extends CommandTestCase
+class TransactionWatchTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetAddTest.php b/tests/Predis/Command/ZSetAddTest.php
index f35aa025..7001c2b5 100644
--- a/tests/Predis/Command/ZSetAddTest.php
+++ b/tests/Predis/Command/ZSetAddTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetAddTest extends CommandTestCase
+class ZSetAddTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetCardinalityTest.php b/tests/Predis/Command/ZSetCardinalityTest.php
index 0ce8bd2d..ddf8b32c 100644
--- a/tests/Predis/Command/ZSetCardinalityTest.php
+++ b/tests/Predis/Command/ZSetCardinalityTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetCardinalityTest extends CommandTestCase
+class ZSetCardinalityTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetCountTest.php b/tests/Predis/Command/ZSetCountTest.php
index 556a3705..143b3575 100644
--- a/tests/Predis/Command/ZSetCountTest.php
+++ b/tests/Predis/Command/ZSetCountTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetCountTest extends CommandTestCase
+class ZSetCountTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetIncrementByTest.php b/tests/Predis/Command/ZSetIncrementByTest.php
index 3ad420fa..1f8855ce 100644
--- a/tests/Predis/Command/ZSetIncrementByTest.php
+++ b/tests/Predis/Command/ZSetIncrementByTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetIncrementByTest extends CommandTestCase
+class ZSetIncrementByTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetIntersectionStoreTest.php b/tests/Predis/Command/ZSetIntersectionStoreTest.php
index 9c799d84..86bece64 100644
--- a/tests/Predis/Command/ZSetIntersectionStoreTest.php
+++ b/tests/Predis/Command/ZSetIntersectionStoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetIntersectionStoreTest extends CommandTestCase
+class ZSetIntersectionStoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetRangeByScoreTest.php b/tests/Predis/Command/ZSetRangeByScoreTest.php
index 9964e0a6..ed525923 100644
--- a/tests/Predis/Command/ZSetRangeByScoreTest.php
+++ b/tests/Predis/Command/ZSetRangeByScoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetRangeByScoreTest extends CommandTestCase
+class ZSetRangeByScoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetRangeTest.php b/tests/Predis/Command/ZSetRangeTest.php
index 3cdaa09e..dba9837e 100644
--- a/tests/Predis/Command/ZSetRangeTest.php
+++ b/tests/Predis/Command/ZSetRangeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetRangeTest extends CommandTestCase
+class ZSetRangeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetRankTest.php b/tests/Predis/Command/ZSetRankTest.php
index c286e199..1e599f40 100644
--- a/tests/Predis/Command/ZSetRankTest.php
+++ b/tests/Predis/Command/ZSetRankTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetRankTest extends CommandTestCase
+class ZSetRankTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetRemoveRangeByRankTest.php b/tests/Predis/Command/ZSetRemoveRangeByRankTest.php
index 0aa46344..2c1a4cb4 100644
--- a/tests/Predis/Command/ZSetRemoveRangeByRankTest.php
+++ b/tests/Predis/Command/ZSetRemoveRangeByRankTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetRemoveRangeByRankTest extends CommandTestCase
+class ZSetRemoveRangeByRankTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php b/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
index 80bf0709..c097bac1 100644
--- a/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
+++ b/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetRemoveRangeByScoreTest extends CommandTestCase
+class ZSetRemoveRangeByScoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetRemoveTest.php b/tests/Predis/Command/ZSetRemoveTest.php
index 514e78ae..6f87d462 100644
--- a/tests/Predis/Command/ZSetRemoveTest.php
+++ b/tests/Predis/Command/ZSetRemoveTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetRemoveTest extends CommandTestCase
+class ZSetRemoveTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetReverseRangeByScoreTest.php b/tests/Predis/Command/ZSetReverseRangeByScoreTest.php
index 3b87daae..3deb9f9e 100644
--- a/tests/Predis/Command/ZSetReverseRangeByScoreTest.php
+++ b/tests/Predis/Command/ZSetReverseRangeByScoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetReverseRangeByScoreTest extends CommandTestCase
+class ZSetReverseRangeByScoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetReverseRangeTest.php b/tests/Predis/Command/ZSetReverseRangeTest.php
index 44d044ff..71b5cf04 100644
--- a/tests/Predis/Command/ZSetReverseRangeTest.php
+++ b/tests/Predis/Command/ZSetReverseRangeTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetReverseRangeTest extends CommandTestCase
+class ZSetReverseRangeTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetReverseRankTest.php b/tests/Predis/Command/ZSetReverseRankTest.php
index 0e33224b..b26dd0b9 100644
--- a/tests/Predis/Command/ZSetReverseRankTest.php
+++ b/tests/Predis/Command/ZSetReverseRankTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetReverseRankTest extends CommandTestCase
+class ZSetReverseRankTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetScanTest.php b/tests/Predis/Command/ZSetScanTest.php
index 17f5cd7b..4a1430ed 100644
--- a/tests/Predis/Command/ZSetScanTest.php
+++ b/tests/Predis/Command/ZSetScanTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetScanTest extends CommandTestCase
+class ZSetScanTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetScoreTest.php b/tests/Predis/Command/ZSetScoreTest.php
index 0c572f33..ee87a027 100644
--- a/tests/Predis/Command/ZSetScoreTest.php
+++ b/tests/Predis/Command/ZSetScoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetScoreTest extends CommandTestCase
+class ZSetScoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Command/ZSetUnionStoreTest.php b/tests/Predis/Command/ZSetUnionStoreTest.php
index 1b9bf80a..7c502cc0 100644
--- a/tests/Predis/Command/ZSetUnionStoreTest.php
+++ b/tests/Predis/Command/ZSetUnionStoreTest.php
@@ -15,7 +15,7 @@ namespace Predis\Command;
  * @group commands
  * @group realm-zset
  */
-class ZSetUnionStoreTest extends CommandTestCase
+class ZSetUnionStoreTest extends PredisCommandTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Connection/ComposableStreamConnectionTest.php b/tests/Predis/Connection/ComposableStreamConnectionTest.php
index bd2d1aee..20a48451 100644
--- a/tests/Predis/Connection/ComposableStreamConnectionTest.php
+++ b/tests/Predis/Connection/ComposableStreamConnectionTest.php
@@ -14,7 +14,7 @@ namespace Predis\Connection;
 /**
  *
  */
-class ComposableStreamConnectionTest extends ConnectionTestCase
+class ComposableStreamConnectionTest extends PredisConnectionTestCase
 {
     /**
      * @group disconnected
diff --git a/tests/Predis/Connection/PhpiredisConnectionTest.php b/tests/Predis/Connection/PhpiredisConnectionTest.php
index 5dc5f7db..d6341846 100644
--- a/tests/Predis/Connection/PhpiredisConnectionTest.php
+++ b/tests/Predis/Connection/PhpiredisConnectionTest.php
@@ -14,7 +14,7 @@ namespace Predis\Connection;
 /**
  * @group ext-phpiredis
  */
-class PhpiredisConnectionTest extends ConnectionTestCase
+class PhpiredisConnectionTest extends PredisConnectionTestCase
 {
     /**
      * @group disconnected
diff --git a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
index a22b001a..e6ff550d 100644
--- a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
+++ b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php
@@ -14,7 +14,7 @@ namespace Predis\Connection;
 /**
  * @group ext-phpiredis
  */
-class PhpiredisStreamConnectionTest extends ConnectionTestCase
+class PhpiredisStreamConnectionTest extends PredisConnectionTestCase
 {
     /**
      * @group disconnected
diff --git a/tests/Predis/Connection/StreamConnectionTest.php b/tests/Predis/Connection/StreamConnectionTest.php
index 577ef768..b8f97535 100644
--- a/tests/Predis/Connection/StreamConnectionTest.php
+++ b/tests/Predis/Connection/StreamConnectionTest.php
@@ -14,7 +14,7 @@ namespace Predis\Connection;
 /**
  *
  */
-class StreamConnectionTest extends ConnectionTestCase
+class StreamConnectionTest extends PredisConnectionTestCase
 {
     /**
      * @group disconnected
diff --git a/tests/Predis/Profile/RedisUnstableTest.php b/tests/Predis/Profile/RedisUnstableTest.php
index 86ec5ba5..21dbf45b 100644
--- a/tests/Predis/Profile/RedisUnstableTest.php
+++ b/tests/Predis/Profile/RedisUnstableTest.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisUnstableTest extends RedisProfileTestCase
+class RedisUnstableTest extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Profile/RedisVersion120Test.php b/tests/Predis/Profile/RedisVersion120Test.php
index f2b417a2..14c9bd2e 100644
--- a/tests/Predis/Profile/RedisVersion120Test.php
+++ b/tests/Predis/Profile/RedisVersion120Test.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisVersion120Test extends RedisProfileTestCase
+class RedisVersion120Test extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Profile/RedisVersion200Test.php b/tests/Predis/Profile/RedisVersion200Test.php
index 41bf23ab..e4958765 100644
--- a/tests/Predis/Profile/RedisVersion200Test.php
+++ b/tests/Predis/Profile/RedisVersion200Test.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisVersion200Test extends RedisProfileTestCase
+class RedisVersion200Test extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Profile/RedisVersion220Test.php b/tests/Predis/Profile/RedisVersion220Test.php
index d37dcf8a..f038dbb4 100644
--- a/tests/Predis/Profile/RedisVersion220Test.php
+++ b/tests/Predis/Profile/RedisVersion220Test.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisVersion220Test extends RedisProfileTestCase
+class RedisVersion220Test extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Profile/RedisVersion240Test.php b/tests/Predis/Profile/RedisVersion240Test.php
index a5f6ebab..4b49ca4a 100644
--- a/tests/Predis/Profile/RedisVersion240Test.php
+++ b/tests/Predis/Profile/RedisVersion240Test.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisVersion240Test extends RedisProfileTestCase
+class RedisVersion240Test extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Profile/RedisVersion260Test.php b/tests/Predis/Profile/RedisVersion260Test.php
index 0048005f..db3ca9ba 100644
--- a/tests/Predis/Profile/RedisVersion260Test.php
+++ b/tests/Predis/Profile/RedisVersion260Test.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisVersion260Test extends RedisProfileTestCase
+class RedisVersion260Test extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Predis/Profile/RedisVersion280Test.php b/tests/Predis/Profile/RedisVersion280Test.php
index e3f557eb..714fb17d 100644
--- a/tests/Predis/Profile/RedisVersion280Test.php
+++ b/tests/Predis/Profile/RedisVersion280Test.php
@@ -14,7 +14,7 @@ namespace Predis\Profile;
 /**
  *
  */
-class RedisVersion280Test extends RedisProfileTestCase
+class RedisVersion280Test extends PredisProfileTestCase
 {
     /**
      * {@inheritdoc}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 43134e9b..af92a0d4 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -14,7 +14,7 @@ require __DIR__.'/../autoload.php';
 require __DIR__.'/PHPUnit/ArrayHasSameValuesConstraint.php';
 require __DIR__.'/PHPUnit/RedisCommandConstraint.php';
 require __DIR__.'/PHPUnit/PredisTestCase.php';
-require __DIR__.'/PHPUnit/CommandTestCase.php';
-require __DIR__.'/PHPUnit/ConnectionTestCase.php';
-require __DIR__.'/PHPUnit/RedisProfileTestCase.php';
-require __DIR__.'/PHPUnit/DistributorTestCase.php';
+require __DIR__.'/PHPUnit/PredisCommandTestCase.php';
+require __DIR__.'/PHPUnit/PredisConnectionTestCase.php';
+require __DIR__.'/PHPUnit/PredisProfileTestCase.php';
+require __DIR__.'/PHPUnit/PredisDistributorTestCase.php';