diff --git a/lib/Predis.php b/lib/Predis.php
index 5ee449e9..430d2e60 100644
--- a/lib/Predis.php
+++ b/lib/Predis.php
@@ -1930,7 +1930,7 @@ class RedisServer_v2_0 extends RedisServerProfile {
             'type'                      => '\Predis\Commands\Type',
 
             /* commands operating on the key space */
-            'keys'                      => '\Predis\Commands\Keys_v1_2',
+            'keys'                      => '\Predis\Commands\Keys',
             'randomkey'                 => '\Predis\Commands\RandomKey',
             'rename'                    => '\Predis\Commands\Rename',
             'renamenx'                  => '\Predis\Commands\RenamePreserve',
@@ -2012,9 +2012,6 @@ class RedisServer_v2_0 extends RedisServerProfile {
             'append'                    => '\Predis\Commands\Append',
             'substr'                    => '\Predis\Commands\Substr',
 
-            /* commands operating on the key space */
-            'keys'                      => '\Predis\Commands\Keys',
-
             /* commands operating on lists */
             'blpop'                     => '\Predis\Commands\ListPopFirstBlocking',
             'brpop'                     => '\Predis\Commands\ListPopLastBlocking',
@@ -2085,7 +2082,7 @@ class RedisServer_v2_2 extends RedisServerProfile {
             'type'                      => '\Predis\Commands\Type',
 
             /* commands operating on the key space */
-            'keys'                      => '\Predis\Commands\Keys_v1_2',
+            'keys'                      => '\Predis\Commands\Keys',
             'randomkey'                 => '\Predis\Commands\RandomKey',
             'rename'                    => '\Predis\Commands\Rename',
             'renamenx'                  => '\Predis\Commands\RenamePreserve',
@@ -2167,9 +2164,6 @@ class RedisServer_v2_2 extends RedisServerProfile {
             'append'                    => '\Predis\Commands\Append',
             'substr'                    => '\Predis\Commands\Substr',
 
-            /* commands operating on the key space */
-            'keys'                      => '\Predis\Commands\Keys',
-
             /* commands operating on lists */
             'blpop'                     => '\Predis\Commands\ListPopFirstBlocking',
             'brpop'                     => '\Predis\Commands\ListPopLastBlocking',
diff --git a/test/ClientFeaturesTest.php b/test/ClientFeaturesTest.php
index 609430c7..211b9ff0 100644
--- a/test/ClientFeaturesTest.php
+++ b/test/ClientFeaturesTest.php
@@ -1,11 +1,11 @@
 <?php
 
-class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
+class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     public $redis;
 
     protected function setUp() {
         $this->redis = RC::getConnection();
-        $this->redis->flushDatabase();
+        $this->redis->flushdb();
     }
 
     protected function tearDown() {
diff --git a/test/PredisShared.php b/test/PredisShared.php
index 75ea2e1a..a2007370 100644
--- a/test/PredisShared.php
+++ b/test/PredisShared.php
@@ -12,6 +12,10 @@ if (I_AM_AWARE_OF_THE_DESTRUCTIVE_POWER_OF_THIS_TEST_SUITE !== true) {
     );
 }
 
+Predis\RedisServerProfile::registerProfile('\Predis\RedisServer_v1_2', '1.2');
+Predis\RedisServerProfile::registerProfile('\Predis\RedisServer_v2_0', '2.0');
+Predis\RedisServerProfile::registerProfile('\Predis\RedisServer_v2_2', '2.2');
+
 if (!function_exists('array_union')) {
     function array_union(Array $a, Array $b) {
         return array_merge($a, array_diff($b, $a));
diff --git a/test/RedisCommandsTest.php b/test/RedisCommandsTest.php
index 5a0c62a7..56590807 100644
--- a/test/RedisCommandsTest.php
+++ b/test/RedisCommandsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class RedisCommandTestSuite extends PHPUnit_Framework_TestCase {
+class RedisCommandsTestSuite extends PHPUnit_Framework_TestCase {
     public $redis;
 
     // TODO: instead of an boolean assertion against the return value