diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 968c60dedf..62986ba7d1 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -25,6 +25,16 @@ class BrowserTestBaseTest extends BrowserTestBase {
    */
   public static $modules = ['test_page_test', 'form_test', 'system_test'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    if ($this->getName() === 'testGetHttpClientWithXdebugMode with data set "Xdebug On"') {
+      putenv('XDEBUG_CONFIG=idekey=cake');
+    }
+    parent::setUp();
+  }
+
   /**
    * Tests basic page test.
    */
@@ -643,7 +653,6 @@ public function testGetDefaultDriveInstance() {
    * Tests the ::getHttpClient() method with Xdebug mode.
    *
    * @dataProvider providerTestGetHttpClientXdebugOn
-   * @dataProvider providerTestGetHttpClientXdebugOff
    */
   public function testGetHttpClientWithXdebugMode($expected) {
     $url = Url::fromRoute('test_page_test.request_cookies')->setAbsolute()->toString();
@@ -658,12 +667,20 @@ public function testGetHttpClientWithXdebugMode($expected) {
    *   Expected response.
    */
   public function providerTestGetHttpClientXdebugOn() {
-    putenv('XDEBUG_CONFIG=idekey=cake');
     return [
       'Xdebug On' => [json_encode(['XDEBUG_SESSION' => 'cake'])],
     ];
   }
 
+  /**
+   * Tests the ::getHttpClient() method with Xdebug mode.
+   *
+   * @dataProvider providerTestGetHttpClientXdebugOff
+   */
+  public function testGetHttpClientWithXdebugModeOff($expected) {
+    $this->testGetHttpClientWithXdebugMode($expected);
+  }
+
   /**
    * Data provider for testGetHttpClientWithXdebugMode.
    *
@@ -672,7 +689,7 @@ public function providerTestGetHttpClientXdebugOn() {
    */
   public function providerTestGetHttpClientXdebugOff() {
     return [
-      'Xdebug Off' => [''],
+      'Xdebug Off' => ['[]'],
     ];
   }