diff --git a/src/Tests/MasqueradeAccessTest.php b/src/Tests/MasqueradeAccessTest.php
index ef3ee69..739e92e 100644
--- a/src/Tests/MasqueradeAccessTest.php
+++ b/src/Tests/MasqueradeAccessTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\masquerade\Tests\MasqueradeAccessTest.
- */
-
 namespace Drupal\masquerade\Tests;
 
 /**
@@ -39,7 +34,7 @@ class MasqueradeAccessTest extends MasqueradeWebTestBase {
    * - masquerade ! masquerade (self)
    * - auth ! *
    */
-  function testAccess() {
+  public function testAccess() {
     $this->drupalLogin($this->rootUser);
     $this->assertCanMasqueradeAs($this->admin_user);
 
@@ -77,9 +72,9 @@ class MasqueradeAccessTest extends MasqueradeWebTestBase {
     $this->assertCanMasqueradeAs($this->auth_user);
 
     // Verify that a user cannot masquerade as himself.
-    $edit = array(
+    $edit = [
       'masquerade_as' => $this->masquerade_user->getAccountName(),
-    );
+    ];
     $this->drupalPostForm('masquerade', $edit, t('Switch'));
     $this->assertRaw(t('You cannot masquerade as yourself. Please choose a different user to masquerade as.'));
     $this->assertNoText(t('Unmasquerade'));
@@ -91,36 +86,36 @@ class MasqueradeAccessTest extends MasqueradeWebTestBase {
   }
 
   /**
-   * Asserts that the currently logged-in user can masquerade as a given target user.
+   * Asserts that the logged-in user can masquerade as a given target user.
    *
    * @param \Drupal\user\UserInterface $target_account
    *   The user to masquerade to.
    */
   protected function assertCanMasqueradeAs($target_account) {
-    $edit = array(
+    $edit = [
       'masquerade_as' => $target_account->getAccountName(),
-    );
+    ];
     $this->drupalPostForm('masquerade', $edit, t('Switch'));
-    $this->assertNoRaw(t('You are not allowed to masquerade as %name.', array(
+    $this->assertNoRaw(t('You are not allowed to masquerade as %name.', [
       '%name' => $target_account->getDisplayName(),
-    )));
+    ]));
     $this->clickLink(t('Unmasquerade'));
   }
 
   /**
-   * Asserts that the currently logged-in user can not masquerade as a given target user.
+   * Asserts that the logged-in user can not masquerade as a given target user.
    *
    * @param \Drupal\user\UserInterface $target_account
    *   The user to masquerade to.
    */
   protected function assertCanNotMasqueradeAs($target_account) {
-    $edit = array(
+    $edit = [
       'masquerade_as' => $target_account->getAccountName(),
-    );
+    ];
     $this->drupalPostForm('masquerade', $edit, t('Switch'));
-    $this->assertRaw(t('You are not allowed to masquerade as %name.', array(
+    $this->assertRaw(t('You are not allowed to masquerade as %name.', [
       '%name' => $target_account->getDisplayName(),
-    )));
+    ]));
     $this->assertNoText(t('Unmasquerade'));
   }
 
diff --git a/src/Tests/MasqueradeCacheTest.php b/src/Tests/MasqueradeCacheTest.php
index cc75356..6d6d7c8 100644
--- a/src/Tests/MasqueradeCacheTest.php
+++ b/src/Tests/MasqueradeCacheTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\masquerade\Tests\MasqueradeCacheTest.
- */
-
 namespace Drupal\masquerade\Tests;
 
 /**
@@ -14,15 +9,32 @@ namespace Drupal\masquerade\Tests;
  */
 class MasqueradeCacheTest extends MasqueradeWebTestBase {
 
-  public static $modules = ['masquerade', 'user', 'block', 'node', 'dynamic_page_cache'];
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'masquerade',
+    'user',
+    'block',
+    'node',
+    'dynamic_page_cache',
+  ];
 
   /**
    * Tests caching for the user switch block.
    */
-  function testMasqueradeSwitchBlockCaching() {
+  public function testMasqueradeSwitchBlockCaching() {
     // Create two masquerade users.
-    $umberto = $this->drupalCreateUser(['masquerade as any user', 'access content'], 'umberto');
-    $nelle = $this->drupalCreateUser(['masquerade as any user', 'access content'], 'nelle');
+    $umberto = $this->drupalCreateUser([
+      'masquerade as any user',
+      'access content',
+    ], 'umberto');
+    $nelle = $this->drupalCreateUser([
+      'masquerade as any user',
+      'access content',
+    ], 'nelle');
 
     // Add the Masquerade block to the sidebar.
     $masquerade_block = $this->drupalPlaceBlock('masquerade');
diff --git a/src/Tests/MasqueradeTest.php b/src/Tests/MasqueradeTest.php
index 85a7197..af29618 100644
--- a/src/Tests/MasqueradeTest.php
+++ b/src/Tests/MasqueradeTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\masquerade\Tests\MasqueradeTest.
- */
-
 namespace Drupal\masquerade\Tests;
 
 /**
@@ -17,7 +12,7 @@ class MasqueradeTest extends MasqueradeWebTestBase {
   /**
    * Tests masquerade user links.
    */
-  function testMasquerade() {
+  public function testMasquerade() {
     $this->drupalLogin($this->admin_user);
 
     // Verify that a token is required.
@@ -37,11 +32,11 @@ class MasqueradeTest extends MasqueradeWebTestBase {
     $this->assertResponse(403);
 
     // Verify that the web user cannot masquerade.
-    $this->drupalGet('user/' . $this->admin_user->id() . '/masquerade', array(
-      'query' => array(
+    $this->drupalGet('user/' . $this->admin_user->id() . '/masquerade', [
+      'query' => [
         'token' => $this->drupalGetToken('user/' . $this->admin_user->id() . '/masquerade'),
-      ),
-    ));
+      ],
+    ]);
     $this->assertResponse(403);
 
     // Verify that the user can unmasquerade.
diff --git a/src/Tests/MasqueradeWebTestBase.php b/src/Tests/MasqueradeWebTestBase.php
index 5d28136..7f55415 100644
--- a/src/Tests/MasqueradeWebTestBase.php
+++ b/src/Tests/MasqueradeWebTestBase.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\masquerade\Tests\MasqueradeWebTestBase.
- */
-
 namespace Drupal\masquerade\Tests;
 
 use Drupal\Component\Utility\Crypt;
@@ -23,9 +18,11 @@ use Drupal\user\UserInterface;
 abstract class MasqueradeWebTestBase extends WebTestBase {
 
   /**
-   * {@inheritdoc}
+   * Modules to install.
+   *
+   * @var array
    */
-  public static $modules = array('masquerade', 'user', 'block');
+  public static $modules = ['masquerade', 'user', 'block'];
 
   /**
    * Various users for the tests.
@@ -44,7 +41,7 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
   /**
    * {@inheritdoc}
    */
-  function setUp() {
+  protected function setUp() {
     parent::setUp();
 
     // Create and configure User module's admin role.