diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index b31d8a0..fb5f3b4 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -899,10 +899,6 @@ protected function tearDown() {
     // Reset all static variables.
     drupal_static_reset();
 
-    // Reset module list and module load status.
-    module_list_reset();
-    module_load_all(FALSE, TRUE);
-
     // Restore original in-memory configuration.
     $conf = $this->originalConf;
 
@@ -914,6 +910,10 @@ protected function tearDown() {
       drupal_valid_test_ua($this->originalPrefix);
     }
 
+    // Reset module list and module load status.
+    module_list_reset();
+    module_load_all(FALSE, TRUE);
+
     // Restore original shutdown callbacks.
     $callbacks = &drupal_register_shutdown_function();
     $callbacks = $this->originalShutdownCallbacks;