diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index cc0c070..e929ed2 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -1323,12 +1323,13 @@ protected function prepareEnvironment() {
     // Bootstrap Drupal so we can use Drupal's built in functions.
     $this->classLoader = require __DIR__ . '/../../../../autoload.php';
     $request = Request::createFromGlobals();
-    $kernel = TestRunnerKernel::createFromRequest($request, $this->classLoader);
-    // TestRunnerKernel expects the working directory to be DRUPAL_ROOT.
-    chdir(DRUPAL_ROOT);
-    $kernel->prepareLegacyRequest($request);
 
     if (!$this->runAgainstInstalledSite) {
+      $kernel = TestRunnerKernel::createFromRequest($request, $this->classLoader);
+      // TestRunnerKernel expects the working directory to be DRUPAL_ROOT.
+      chdir(DRUPAL_ROOT);
+      $kernel->prepareLegacyRequest($request);
+
       $this->prepareDatabasePrefix();
       $this->originalSiteDirectory = $kernel->findSitePath($request);
 
@@ -1392,7 +1393,10 @@ protected function prepareEnvironment() {
       $callbacks = [];
     }
     else {
-      $this->container = $this->kernel->getContainer();
+      $kernel = DrupalKernel::createFromRequest($request, $this->classLoader, 'testing');
+      chdir(DRUPAL_ROOT);
+      $kernel->prepareLegacyRequest($request);
+      $this->container = $kernel->getContainer();
 
       // Set some debugging defaults.
       $config_values = [