diff --git a/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php b/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php
index f179ec9..9ddeaff 100644
--- a/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php
+++ b/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php
@@ -74,10 +74,11 @@ protected function setUp() {
    * Tests form behaviour.
    */
   public function testActionUrlBehavior() {
-    // Create a new request which has a request uri with multiple leading
-    // slashes and make it the master request.
     $request_stack = \Drupal::service('request_stack');
-    $original_request = $request_stack->pop();
+    $original_request = $request_stack->getCurrentRequest();
+
+    // Create a new request which has a request uri with multiple leading
+    // slashes and make it the current request.
     $request = Request::create($original_request->getSchemeAndHttpHost() . '//example.org');
     $request_stack->push($request);
 
@@ -88,11 +89,10 @@ public function testActionUrlBehavior() {
     $elements = $this->xpath('//form/@action');
     $action = (string) $elements[0];
     $this->assertEqual($original_request->getSchemeAndHttpHost() . '//example.org', $action);
+    $request_stack->pop();
 
     // Create a new request which has a request uri with a single leading slash
-    // and make it the master request.
-    $request_stack = \Drupal::service('request_stack');
-    $original_request = $request_stack->pop();
+    // and make it the current request.
     $request = Request::create($original_request->getSchemeAndHttpHost() . '/example.org');
     $request_stack->push($request);
 
@@ -103,6 +103,7 @@ public function testActionUrlBehavior() {
     $elements = $this->xpath('//form/@action');
     $action = (string) $elements[0];
     $this->assertEqual('/example.org', $action);
+    $request_stack->pop();
   }
 
 }