diff --git a/examples/SharedConfigurations.php b/examples/SharedConfigurations.php
index a176ecee..85603591 100644
--- a/examples/SharedConfigurations.php
+++ b/examples/SharedConfigurations.php
@@ -1,12 +1,8 @@
 <?php
 
-spl_autoload_register(function($class) {
-    $file = __DIR__.'/../lib/'.strtr($class, '\\', '/').'.php';
-    if (file_exists($file)) {
-        require $file;
-        return true;
-    }
-});
+require __DIR__.'/../lib/Predis/Autoloader.php';
+
+Predis\Autoloader::register();
 
 $single_server = array(
     'host'     => '127.0.0.1',
diff --git a/test/bootstrap.php b/test/bootstrap.php
index d96033db..a9a85b14 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -1,12 +1,7 @@
 <?php
 
-spl_autoload_register(function($class)
-{
-    $file = __DIR__.'/../lib/'.strtr($class, '\\', '/').'.php';
-    if (file_exists($file)) {
-        require $file;
-        return true;
-    }
-});
+require __DIR__.'/../lib/Predis/Autoloader.php';
+
+Predis\Autoloader::register();
 
 require __DIR__.'/PredisShared.php';