.../contextual/tests/src/FunctionalJavascript/EditModeTest.php       | 1 -
 core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php     | 5 -----
 .../workspaces/tests/src/Functional/WorkspaceSwitcherTest.php        | 2 +-
 .../workspaces/tests/src/Functional/WorkspaceTestUtilities.php       | 5 -----
 .../FunctionalJavascriptTests/Tests/DrupalSelenium2DriverTest.php    | 5 +++++
 core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php | 2 +-
 core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php        | 2 +-
 .../tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php | 5 -----
 8 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php b/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php
index 82d5adfa65..0133bca215 100644
--- a/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php
+++ b/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php
@@ -34,7 +34,6 @@ class EditModeTest extends WebDriverTestBase {
    */
   protected $defaultTheme = 'stark';
 
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index 7ee080c5a6..5c87347792 100644
--- a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -25,11 +25,6 @@ class BreadcrumbTest extends BrowserTestBase {
    */
   public static $modules = ['menu_test', 'block'];
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
   /**
    * An administrative user.
    *
diff --git a/core/modules/workspaces/tests/src/Functional/WorkspaceSwitcherTest.php b/core/modules/workspaces/tests/src/Functional/WorkspaceSwitcherTest.php
index b674040ba7..7c8c8fa30f 100644
--- a/core/modules/workspaces/tests/src/Functional/WorkspaceSwitcherTest.php
+++ b/core/modules/workspaces/tests/src/Functional/WorkspaceSwitcherTest.php
@@ -23,7 +23,7 @@ class WorkspaceSwitcherTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'stark';
+  protected $defaultTheme = 'classy';
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/workspaces/tests/src/Functional/WorkspaceTestUtilities.php b/core/modules/workspaces/tests/src/Functional/WorkspaceTestUtilities.php
index 46342ffa4c..bede33a866 100644
--- a/core/modules/workspaces/tests/src/Functional/WorkspaceTestUtilities.php
+++ b/core/modules/workspaces/tests/src/Functional/WorkspaceTestUtilities.php
@@ -15,11 +15,6 @@ trait WorkspaceTestUtilities {
 
   use BlockCreationTrait;
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
   /**
    * Loads a single entity by its label.
    *
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Tests/DrupalSelenium2DriverTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Tests/DrupalSelenium2DriverTest.php
index 02fcc6ebaf..687cbca4ca 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Tests/DrupalSelenium2DriverTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Tests/DrupalSelenium2DriverTest.php
@@ -23,6 +23,11 @@ class DrupalSelenium2DriverTest extends WebDriverTestBase {
    */
   protected static $modules = ['file', 'field_ui', 'entity_test'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php b/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php
index 2111ad7574..123c22b573 100644
--- a/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php
+++ b/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php
@@ -23,7 +23,7 @@ public function testGetTestMethodCallerChildClass() {
     $method_caller = $this->getTestMethodCaller();
     $expected = [
       'file' => __FILE__,
-      'line' => 18,
+      'line' => 23,
       'function' => __CLASS__ . '->' . __FUNCTION__ . '()',
       'class' => BrowserTestBase::class,
       'object' => $this,
diff --git a/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php b/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php
index 35b0fa349a..9baad8f27b 100644
--- a/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php
+++ b/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php
@@ -23,7 +23,7 @@ public function testGetTestMethodCaller() {
     $method_caller = $this->getTestMethodCaller();
     $expected = [
       'file' => __FILE__,
-      'line' => 18,
+      'line' => 23,
       'function' => __CLASS__ . '->' . __FUNCTION__ . '()',
       'class' => BrowserTestBase::class,
       'object' => $this,
diff --git a/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php b/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
index 60da0bbb60..48ebb9a801 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
@@ -14,11 +14,6 @@ class StandardInstallerTest extends ConfigAfterInstallerTestBase {
    */
   protected $profile = 'standard';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
   /**
    * Ensures that the user page is available after installation.
    */