diff -u b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
--- b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -789,15 +789,16 @@
       }
       $class = get_parent_class($class);
     }
-
     if ($modules) {
       $modules = array_unique($modules);
       $success = \Drupal::moduleHandler()->install($modules, TRUE);
       $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
-      // Reset/rebuild all data structures after enabling the modules.
-      $this->resetAll();
+      $this->rebuildContainer();
     }
 
+    // Reset/rebuild all data structures after enabling the modules.
+    $this->resetAll();
+
     // Now make sure that the file path configurations are saved. This is done
     // after we install the modules to override default values.
     foreach ($variable_groups as $config_base => $variables) {
@@ -815,16 +816,15 @@
       }
       $class = get_parent_class($class);
     }
+
     if ($modules) {
       $modules = array_unique($modules);
       $success = \Drupal::moduleHandler()->install($modules, TRUE);
       $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
-      $this->rebuildContainer();
+      // Reset/rebuild all data structures after enabling the modules.
+      $this->resetAll();
     }
 
-    // Reset/rebuild all data structures after enabling the modules.
-    $this->resetAll();
-
     // Now make sure that the file path configurations are saved. This is done
     // after we install the modules to override default values.
     \Drupal::config('system.file')
@@ -959,10 +959,6 @@
     // Reset static variables and reload permissions.
     $this->refreshVariables();
     $this->checkPermissions(array(), TRUE);
-
-    // Make sure the url generator has a request object, otherwise calls to
-    // $this->drupalGet() will fail.
-    $this->prepareRequestForGenerator();
   }
 
   /**
@@ -990,6 +986,10 @@
     // Reset static variables and reload permissions.
     $this->refreshVariables();
     $this->checkPermissions(array(), TRUE);
+
+    // Make sure the url generator has a request object, otherwise calls to
+    // $this->drupalGet() will fail.
+    $this->prepareRequestForGenerator();
   }
 
   /**
only in patch2:
unchanged:
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -78,7 +78,6 @@ services:
   config.factory:
     class: Drupal\Core\Config\ConfigFactory
     tags:
-      - { name: persist }
       - { name: event_subscriber }
     arguments: ['@config.storage', '@event_dispatcher', '@config.typed']
   config.installer: