diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 2fe6f53..1ed5b55 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -1407,7 +1407,7 @@ protected function curlExec($curl_options, $redirect = FALSE) {
       if ($this->drupalGetHeader('location')) {
         $this->redirectCount++;
         $curl_options = array();
-        $curl_options[CURLOPT_URL] = $this->drupalGetHeader('location');
+        $curl_options[CURLOPT_URL] = parse_url($url, PHP_URL_HOST) . $this->drupalGetHeader('location');
         $curl_options[CURLOPT_HTTPGET] = TRUE;
         return $this->curlExec($curl_options, TRUE);
       }
diff --git a/core/modules/system/src/Tests/Update/RebuildScriptTest.php b/core/modules/system/src/Tests/Update/RebuildScriptTest.php
index 9109a7d..3482bd4 100644
--- a/core/modules/system/src/Tests/Update/RebuildScriptTest.php
+++ b/core/modules/system/src/Tests/Update/RebuildScriptTest.php
@@ -25,7 +25,13 @@ public function testRebuild() {
     $this->assertUrl(new Url('<front>'));
     $this->assertNoText('Cache rebuild complete.');
 
-    $this->settingsSet('rebuild_access', TRUE);
+    $settings['settings']['rebuild_access'] = (object) [
+      'value' => TRUE,
+      'required' => TRUE,
+    ];
+
+    $this->writeSettings($settings);
+    $this->rebuildAll();
     $this->drupalGet(Url::fromUri('base:core/rebuild.php'));
     $this->assertUrl(new Url('<front>'));
     $this->assertText('Cache rebuild complete.');