diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
index f064b77..9a16236 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
@@ -118,7 +118,8 @@ public function testNodeHandler() {
 
     // Test as a non-admin.
     $normal_user = $this->drupalCreateUser(array('access content'));
-    $GLOBALS['user'] = $normal_user;
+    $request = $this->container->get('request');
+    $request->attributes->set('account', $normal_user);
     $referenceable_tests = array(
       array(
         'arguments' => array(
@@ -170,7 +171,7 @@ public function testNodeHandler() {
 
     // Test as an admin.
     $admin_user = $this->drupalCreateUser(array('access content', 'bypass node access'));
-    $GLOBALS['user'] = $admin_user;
+    $request->attributes->set('account', $admin_user);
     $referenceable_tests = array(
       array(
         'arguments' => array(
@@ -264,7 +265,8 @@ public function testUserHandler() {
     }
 
     // Test as a non-admin.
-    $GLOBALS['user'] = $users['non_admin'];
+    $request = $this->container->get('request');
+    $request->attributes->set('account', $users['non_admin']);
     $referenceable_tests = array(
       array(
         'arguments' => array(
@@ -303,7 +305,7 @@ public function testUserHandler() {
     );
     $this->assertReferenceable($instance, $referenceable_tests, 'User handler');
 
-    $GLOBALS['user'] = $users['admin'];
+    $request->attributes->set('account', $users['admin']);
     $referenceable_tests = array(
       array(
         'arguments' => array(
@@ -435,7 +437,8 @@ public function testCommentHandler() {
 
     // Test as a non-admin.
     $normal_user = $this->drupalCreateUser(array('access content', 'access comments'));
-    $GLOBALS['user'] = $normal_user;
+    $request = $this->container->get('request');
+    $request->attributes->set('account', $normal_user);
     $referenceable_tests = array(
       array(
         'arguments' => array(
@@ -474,7 +477,7 @@ public function testCommentHandler() {
 
     // Test as a comment admin.
     $admin_user = $this->drupalCreateUser(array('access content', 'access comments', 'administer comments'));
-    $GLOBALS['user'] = $admin_user;
+    $request->attributes->set('account', $admin_user);
     $referenceable_tests = array(
       array(
         'arguments' => array(
@@ -492,7 +495,7 @@ public function testCommentHandler() {
 
     // Test as a node and comment admin.
     $admin_user = $this->drupalCreateUser(array('access content', 'access comments', 'administer comments', 'bypass node access'));
-    $GLOBALS['user'] = $admin_user;
+    $request->attributes->set('account', $admin_user);
     $referenceable_tests = array(
       array(
         'arguments' => array(