diff -u b/core/modules/user/src/Tests/UserAutocompleteTest.php b/core/modules/user/src/Tests/UserAutocompleteTest.php
--- b/core/modules/user/src/Tests/UserAutocompleteTest.php
+++ b/core/modules/user/src/Tests/UserAutocompleteTest.php
@@ -26,7 +26,7 @@
   protected $unprivilegedUser;
 
   /**
-   * An user with permission to access user profiles.
+   * A user with permission to access user profiles.
    *
    * @var \Drupal\user\UserInterface
    */
diff -u b/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php
--- b/core/modules/user/src/Tests/UserCancelTest.php
+++ b/core/modules/user/src/Tests/UserCancelTest.php
@@ -91,7 +91,7 @@
 
     // Try to cancel uid 1's account with a different user.
     $admin_user = $this->drupalCreateUser(array('administer users'));
-    $this->drupalLogin($admin_user);
+    $this->drupalLogin($this->admin_user);
     $edit = array(
       'action' => 'user_cancel_user_action',
       'user_bulk_form[0]' => TRUE,
diff -u b/core/modules/user/src/Tests/UserRolesAssignmentTest.php b/core/modules/user/src/Tests/UserRolesAssignmentTest.php
--- b/core/modules/user/src/Tests/UserRolesAssignmentTest.php
+++ b/core/modules/user/src/Tests/UserRolesAssignmentTest.php
@@ -16,17 +16,10 @@
  */
 class UserRolesAssignmentTest extends WebTestBase {
 
-  /**
-   * User with admin privileges.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('administer permissions', 'administer users'));
-    $this->drupalLogin($this->adminUser);
+    $admin_user = $this->drupalCreateUser(array('administer permissions', 'administer users'));
+    $this->drupalLogin($this->admin_user);
   }
 
   /**
diff -u b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php
--- b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php
+++ b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php
@@ -17,10 +17,11 @@
  * @group user
  */
 class ArgumentValidateTest extends UserTestBase {
+
   /**
-   * The names of the views used by this test.
+   * Views used by this test.
    *
-   * @var string[]
+   * @var array
    */
   public static $testViews = array('test_view_argument_validate_user', 'test_view_argument_validate_username');
 
reverted:
--- b/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
+++ a/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
@@ -18,9 +18,9 @@
 class HandlerFieldRoleTest extends UserTestBase {
 
   /**
+   * Views used by this test.
-   * The names of the views used by this test.
    *
+   * @var array
-   * @var string[]
    */
   public static $testViews = array('test_views_handler_field_role');
 
reverted:
--- b/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
+++ a/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
@@ -18,9 +18,9 @@
 class HandlerFieldUserNameTest extends UserTestBase {
 
   /**
+   * Views used by this test.
-   * The names of the views used by this test.
    *
+   * @var array
-   * @var string[]
    */
   public static $testViews = array('test_views_handler_field_user_name');
 
reverted:
--- b/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php
+++ a/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php
@@ -36,14 +36,14 @@
   /**
    * Accounts used by this test.
    *
+   * @var array
-   * @var \Drupal\user\UserInterface[]
    */
   protected $accounts = array();
 
   /**
    * Usernames of $accounts.
    *
+   * @var array
-   * @var string[]
    */
   protected $names = array();
 
reverted:
--- b/core/modules/user/src/Tests/Views/UserTestBase.php
+++ a/core/modules/user/src/Tests/Views/UserTestBase.php
@@ -25,14 +25,14 @@
   /**
    * Users to use during this test.
    *
+   * @var array
-   * @var \Drupal\user\UserInterface[]
    */
   protected $users = array();
 
   /**
    * Nodes to use during this test.
    *
+   * @var array
-   * @var \Drupal\node\NodeInterface[]
    */
   protected $nodes = array();
 
reverted:
--- b/core/modules/user/src/Tests/Views/UserUnitTestBase.php
+++ a/core/modules/user/src/Tests/Views/UserUnitTestBase.php
@@ -25,7 +25,7 @@
   /**
    * Users to use during this test.
    *
+   * @var array
-   * @var \Drupal\user\UserInterface[]
    */
   protected $users = array();