diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index 08d8871..4f47023 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -6,17 +6,20 @@
 $loader->add('Drupal\Core', __DIR__ . "/../../core/lib");
 $loader->add('Drupal\Component', __DIR__ . "/../../core/lib");
 
-foreach (scandir(__DIR__ . "/../modules") as $module) {
-  $loader->add('Drupal\\' . $module, __DIR__ . "/../modules/" . $module . "/lib");
-  // Add test module classes.
-  $test_modules_dir = __DIR__ . "/../modules/$module/tests/modules";
-  if (is_dir($test_modules_dir)) {
-    foreach (scandir($test_modules_dir) as $test_module) {
-      $loader->add('Drupal\\' . $test_module, $test_modules_dir . '/' . $test_module . '/lib');
+foreach (array(__DIR__ . '/../modules', __DIR__ . '/../../modules') as $location) {
+  foreach (scandir($location) as $module) {
+    $loader->add('Drupal\\' . $module, "$location/$module/lib");
+    // Add test module classes.
+    $test_modules_dir = "$location/$module/tests/modules";
+    if (is_dir($test_modules_dir)) {
+      foreach (scandir($test_modules_dir) as $test_module) {
+        $loader->add('Drupal\\' . $test_module, $test_modules_dir . '/' . $test_module . '/lib');
+      }
     }
   }
 }
 
+
 require __DIR__ . "/../../core/lib/Drupal.php";
 // Look into removing this later.
 define('REQUEST_TIME', (int) $_SERVER['REQUEST_TIME']);