diff --git a/app/bootstrap.php b/app/bootstrap.php
index 6dec2073..bd4b5ede 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,3 +1,3 @@
 <?php
 
-namespace { return $loader = require_once __DIR__.'/autoload.php'; }
+namespace { $loader = require_once __DIR__.'/autoload.php'; }
diff --git a/app/bootstrap_test.php b/app/bootstrap_test.php
index 78070b43..7212611f 100644
--- a/app/bootstrap_test.php
+++ b/app/bootstrap_test.php
@@ -6,5 +6,4 @@
 passthru(__DIR__.'/console --env=test -q doctrine:schema:create');
 passthru(__DIR__.'/console --env=test -q doctrine:fixtures:load -n');
 
-$loader = require __DIR__.'/bootstrap.php';
-$loader->add('AuthBucket\OAuth2\Tests', __DIR__.'../tests');
+require __DIR__.'/bootstrap.php';