diff --git a/core/modules/field/src/Tests/String/StringFieldTest.php b/core/modules/field/src/Tests/String/StringFieldTest.php
index f9a6df2a50a1e4202f08d37e9e6ea9477df6ad9e..625d22c2632f7a8ad7c4aeec7469638bdf654d8d 100644
--- a/core/modules/field/src/Tests/String/StringFieldTest.php
+++ b/core/modules/field/src/Tests/String/StringFieldTest.php
@@ -33,13 +33,18 @@ class StringFieldTest extends WebTestBase {
    */
   public static $modules = array('entity_test');
 
-  protected $web_user;
+  /**
+   * A user without any special permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
 
   protected function setUp() {
     parent::setUp();
 
-    $this->web_user = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
-    $this->drupalLogin($this->web_user);
+    $this->webUser = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
+    $this->drupalLogin($this->webUser);
   }
 
   // Test fields.
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index 515097a4c0e5eb2b0f97644ee2bad02b6f54772c..f47fdd7f8b6c3a87c7790c97de9eca88b15187b6 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -18,12 +18,17 @@
  */
 class TextFieldTest extends StringFieldTest {
 
-  protected $admin_user;
+  /**
+   * A user with relevant administrative privileges.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
 
   protected function setUp() {
     parent::setUp();
 
-    $this->admin_user = $this->drupalCreateUser(array('administer filters'));
+    $this->adminUser = $this->drupalCreateUser(array('administer filters'));
   }
 
   // Test fields.
@@ -106,13 +111,13 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
       ->save();
 
     // Disable all text formats besides the plain text fallback format.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     foreach (filter_formats() as $format) {
       if (!$format->isFallbackFormat()) {
         $this->drupalPostForm('admin/config/content/formats/manage/' . $format->format . '/disable', array(), t('Disable'));
       }
     }
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     // Display the creation form. Since the user only has access to one format,
     // no format selector will be displayed.
@@ -140,7 +145,7 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
 
     // Create a new text format that does not escape HTML, and grant the user
     // access to it.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $edit = array(
       'format' => Unicode::strtolower($this->randomMachineName()),
       'name' => $this->randomMachineName(),
@@ -150,10 +155,10 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
     $format = entity_load('filter_format', $edit['format']);
     $format_id = $format->format;
     $permission = $format->getPermissionName();
-    $roles = $this->web_user->getRoles();
+    $roles = $this->webUser->getRoles();
     $rid = $roles[0];
     user_role_grant_permissions($rid, array($permission));
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     // Display edition form.
     // We should now have a 'text format' selector.