diff --git a/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/SystemTest.php b/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/SystemTest.php
index e153b94..2806ecf 100644
--- a/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/SystemTest.php
+++ b/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/SystemTest.php
@@ -19,8 +19,8 @@ class SystemTest {
    *
    * @see system_authorized_init()
    */
-  public function authorizeInitPage($page_title) {
-    $authorize_url = $GLOBALS['base_url'] . '/core/authorize.php';
+  public function authorizeInitPage($page_title, Request $request) {
+    $authorize_url = $request->getBaseUrl() . '/core/authorize.php';
     system_authorized_init('system_test_authorize_run', drupal_get_path('module', 'system_test') . '/system_test.module', array(), $page_title);
     return new RedirectResponse($authorize_url);
   }
@@ -80,7 +80,6 @@ public function setHeader(Request $request) {
     $value = $request->query->get('value');
     $response = new Response;
     $response->headers->set($name, $value);
-    drupal_add_http_header($_GET['name'], $_GET['value']);
     $content =  t('The following header was set: %name: %value', array('%name' => $name, '%value' => $value));
     $response->setContent($content);
     return $response;