diff --git a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
index ee886b1..d019d3f 100644
--- a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -18,6 +18,13 @@
  */
 class UserSessionTest extends UnitTestCase {
 
+  /**
+   * The user sessions used in the test
+   *
+   * @var \Drupal\Core\Session\AccountInterface[]
+   */
+  protected $users = array();
+
   public static function getInfo() {
     return array(
       'name' => 'User session object',
@@ -32,15 +39,11 @@ public static function getInfo() {
    * @return array
    */
   public function providerTestHasPermission() {
-    $user_one = $this->createUserSession(array('role_one'));
-    $user_two = $this->createUserSession(array('role_one', 'role_two'));
-    $user_last = $this->createUserSession();
-
     $data = array();
-    $data[] = array('example permission', array($user_one, $user_two), array($user_last));
-    $data[] = array('another example permission', array($user_two), array($user_one, $user_last));
-    $data[] = array('final example permission', array(), array($user_one, $user_two, $user_last));
-//
+    $data[] = array('example permission', array('user_one', 'user_two'), array('user_last'));
+    $data[] = array('another example permission', array('user_two'), array('user_one', 'user_last'));
+    $data[] = array('final example permission', array(), array('user_one', 'user_two', 'user_last'));
+
     return $data;
   }
 
@@ -94,7 +97,7 @@ protected function setUp() {
     $role_storage->expects($this->any())
       ->method('load')
       ->will($this->returnValueMap(array(
-        array(NULL, $roles),
+        array(array(), $roles),
         array(array('role_one'), array($roles['role_one'])),
         array(array('role_two'), array($roles['role_two'])),
         array(array('role_one', 'role_two'), array($roles['role_one'], $roles['role_two'])),
@@ -110,6 +113,10 @@ protected function setUp() {
     $container = new ContainerBuilder();
     $container->set('plugin.manager.entity', $entity_manager);
     \Drupal::setContainer($container);
+
+    $this->users['user_one'] = $this->createUserSession(array('role_one'));
+    $this->users['user_two'] = $this->createUserSession(array('role_one', 'role_two'));
+    $this->users['user_last'] = $this->createUserSession();
   }
 
   /**
@@ -127,11 +134,11 @@ protected function setUp() {
    * @see \Drupal\Core\Session\UserSession::hasPermission().
    */
   public function testHasPermission($permission, array $sessions_with_access, array $sessions_without_access) {
-    foreach ($sessions_with_access as $user_session) {
-      $this->assertTrue($user_session->hasPermission($permission));
+    foreach ($sessions_with_access as $name) {
+      $this->assertTrue($this->users[$name]->hasPermission($permission));
     }
-    foreach ($sessions_without_access as $user_session) {
-      $this->assertFalse($user_session->hasPermission($permission));
+    foreach ($sessions_without_access as $name) {
+      $this->assertFalse($this->users[$name]->hasPermission($permission));
     }
   }