diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
index 0f446b91c..ede398032 100644
--- a/Tests/Functional/app/AppKernel.php
+++ b/Tests/Functional/app/AppKernel.php
@@ -87,9 +87,6 @@ public function getLogDir()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load($this->rootConfig);
-        if(class_exists('Symfony\Component\Asset\Package')) {
-            $loader->load(__DIR__.'/config/assets.yml');
-        }
     }
 
     public function serialize()
diff --git a/Tests/Functional/app/config/assets.yml b/Tests/Functional/app/config/assets.yml
deleted file mode 100644
index b538bd8e6..000000000
--- a/Tests/Functional/app/config/assets.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-framework:
-    assets: ~
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
new file mode 100644
index 000000000..0da1bdd26
--- /dev/null
+++ b/Tests/bootstrap.php
@@ -0,0 +1,9 @@
+<?php
+
+$file = __DIR__.'/../vendor/autoload.php';
+if (!file_exists($file)) {
+    throw new RuntimeException('Install dependencies using composer to run the test suite.');
+}
+
+$autoload = require $file;
+Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($autoload, 'loadClass'));
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c6a5a8cf2..9bae26f98 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" color="true">
+<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
     <php>
         <ini name="xdebug.max_nesting_level" value="200" />
     </php>