diff --git a/Resources/config/propel.xml b/Resources/config/propel.xml
index 102935c..297e735 100644
--- a/Resources/config/propel.xml
+++ b/Resources/config/propel.xml
@@ -19,7 +19,7 @@
             </call>
         </service>
 
-        <service id="fos_elastica.manager.propel" class="%fos_elastica.manager.class%">
+        <service id="fos_elastica.manager.propel" class="FOS\ElasticaBundle\Doctrine\RepositoryManager">
             <argument type="service" id="annotation_reader"/>
         </service>
     </services>
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
deleted file mode 100644
index 30fb165..0000000
--- a/Tests/bootstrap.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if (file_exists($file = __DIR__.'/../vendor/autoload.php')) {
-    $loader = require_once $file;
-} else {
-    throw new RuntimeException('Install dependencies to run test suite.');
-}
-
-spl_autoload_register(function($class) {
-    if (0 === strpos($class, 'FOS\\ElasticaBundle\\')) {
-        $path = __DIR__.'/../'.implode('/', array_slice(explode('\\', $class), 2)).'.php';
-        if (!stream_resolve_include_path($path)) {
-            return false;
-        }
-        require_once $path;
-        return true;
-    }
-    return false;
-});
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 005cfd8..799d5bf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="FOSElasticaBundle Test Suite">
             <directory>./Tests</directory>