diff --git a/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php b/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php
index 90fb68c070..f14779e26b 100644
--- a/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php
+++ b/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\user\Kernel\Views;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\user\Entity\Role;
 use Drupal\user\Entity\User;
 use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
 
@@ -14,13 +13,6 @@
  */
 class UserViewsFieldAccessTest extends FieldFieldAccessTestBase {
 
-  /**
-   * Stores a user entity to display in the view.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $subjectUser;
-
   /**
    * {@inheritdoc}
    */
@@ -33,7 +25,9 @@ protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);
 
     $this->installEntitySchema('user');
+  }
 
+  public function testUserFields() {
     ConfigurableLanguage::create([
       'id' => 'es',
       'name' => 'Spanish',
@@ -43,7 +37,7 @@ protected function setUp($import_test_views = TRUE) {
       'name' => 'French',
     ])->save();
 
-    $this->subjectUser = User::create([
+    $user = User::create([
       'name' => 'test user',
       'mail' => 'druplicon@drop.org',
       'status' => 1,
@@ -52,50 +46,20 @@ protected function setUp($import_test_views = TRUE) {
       'timezone' => 'ut1',
       'created' => 123456,
     ]);
-    $this->subjectUser->save();
-  }
 
-  /**
-   * Tests whether a regular user has access to regular fields.
-   */
-  public function testUserFields() {
-    $this->assertFieldAccess('user', 'uid', $this->subjectUser->id());
-    $this->assertFieldAccess('user', 'uuid', $this->subjectUser->uuid());
-    $this->assertFieldAccess('user', 'langcode', $this->subjectUser->language()->getName());
-    $this->assertFieldAccess('user', 'name', 'test user');
+    $user->save();
 
     // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-    // $this->assertFieldAccess('user', 'mail', 'druplicon@drop.org');
-    // $this->assertFieldAccess('user', 'created', \Drupal::service('date.formatter')->format(123456));
-    // $this->assertFieldAccess('user', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
-  }
-
-  /**
-   * Tests whether an admin user has access to regular and special fields.
-   */
-  public function testUserFieldsAsAdmin() {
-    Role::create([
-      'id' => 'user_admin',
-      'label' => 'User role',
-      'permissions' => ['administer users'],
-    ])->save();
-    $this->userWithAccess->addRole('user_admin');
-
-    $this->assertFieldAccess('user', 'uid', $this->subjectUser->id());
-    $this->assertFieldAccess('user', 'uuid', $this->subjectUser->uuid());
-    $this->assertFieldAccess('user', 'langcode', $this->subjectUser->language()->getName());
-    $this->assertFieldAccess('user', 'name', 'test user');
 
-    // Check whether an admin can see fields only the account owner can see.
+    $this->assertFieldAccess('user', 'uid', $user->id());
+    $this->assertFieldAccess('user', 'uuid', $user->uuid());
+    $this->assertFieldAccess('user', 'langcode', $user->language()->getName());
     $this->assertFieldAccess('user', 'preferred_langcode', 'Spanish');
     $this->assertFieldAccess('user', 'preferred_admin_langcode', 'French');
+    $this->assertFieldAccess('user', 'name', 'test user');
+    // $this->assertFieldAccess('user', 'mail', 'druplicon@drop.org');
     $this->assertFieldAccess('user', 'timezone', 'ut1');
-
-    // Check whether an admin can see fields which are otherwise not visible.
     $this->assertFieldAccess('user', 'status', 'On');
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-    // $this->assertFieldAccess('user', 'mail', 'druplicon@drop.org');
     // $this->assertFieldAccess('user', 'created', \Drupal::service('date.formatter')->format(123456));
     // $this->assertFieldAccess('user', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
   }
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php b/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php
index ac3d7d032d..5ff77bc9f4 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php
@@ -40,14 +40,9 @@ protected function setUp($import_test_views = TRUE) {
 
     $this->installEntitySchema('user');
 
-    // Create user 1 so that the user created later in the test has a different
-    // user ID.
-    // @todo Remove in https://www.drupal.org/node/540008.
-    User::create(['uid' => 1, 'name' => 'user1'])->save();
-
     $role_with_access = Role::create([
       'id' => 'with_access',
-      'permissions' => ['view test entity field', 'access content'],
+      'permissions' => ['view test entity field'],
     ]);
     $role_with_access->save();
     $role_without_access = Role::create([