diff --git a/phpunit.xml b/phpunit.xml
index 74d7e0dc93..4527207411 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="bootstrap/autoload.php"
+         bootstrap="tests/bootstrap.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 969400b128..a6928a1633 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -10,7 +10,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
      */
     public function createApplication()
     {
-        $app = require_once __DIR__.'/../bootstrap/autoload.php';
         $app = require __DIR__.'/../bootstrap/app.php';
         $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000000..6904c16b33
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * October autoloader
+ */
+require __DIR__ . '/../bootstrap/autoload.php';
+
+/*
+ * Fallback autoloader
+ */
+October\Rain\Support\ClassLoader::register();
+October\Rain\Support\ClassLoader::addDirectories([
+    __DIR__.'/../modules',
+    __DIR__.'/../plugins'
+]);
diff --git a/tests/unit/phpunit.xml b/tests/unit/phpunit.xml
index b56a17834d..29a3bb3a72 100644
--- a/tests/unit/phpunit.xml
+++ b/tests/unit/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="../../bootstrap/autoload.php"
+         bootstrap="../bootstrap.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"