diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 86bedc3f32..e2b980b1c8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,6 +8,8 @@ if ($configDir) {
 
 require_once __DIR__ . '/../lib/base.php';
 
+\OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true);
+\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true);
 \OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
 
 // load all enabled apps