diff --git a/core/modules/user/tests/src/Functional/UserBlocksTest.php b/core/modules/user/tests/src/Functional/UserBlocksTest.php
index 1b9f553c40..b304d00f1d 100644
--- a/core/modules/user/tests/src/Functional/UserBlocksTest.php
+++ b/core/modules/user/tests/src/Functional/UserBlocksTest.php
@@ -52,10 +52,10 @@ public function testUserLoginBlockVisibility() {
       $this->drupalGet($path);
       $elements = $this->xpath('//div[contains(@class,"block-user-login-block") and @role="form"]');
       if ($expected_visibility) {
-        self::assertTrue(!empty($elements), 'User login block in path "' . $path . '" should be visible');
+        $this->assertTrue(!empty($elements), 'User login block in path "' . $path . '" should be visible');
       }
       else {
-        self::assertTrue(empty($elements), 'User login block in path "' . $path . '" should not be visible');
+        $this->assertTrue(empty($elements), 'User login block in path "' . $path . '" should not be visible');
       }
     }
   }
@@ -81,7 +81,7 @@ public function testUserLoginBlock() {
     // Now, log out and repeat with a non-403 page.
     $this->drupalLogout();
     $this->drupalGet('filter/tips');
-    self::assertEquals('MISS', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
+    $this->assertEquals('MISS', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
     $this->drupalPostForm(NULL, $edit, t('Log in'));
     $web_assert->pageTextNotContains(t('User login'));
     $web_assert->responseMatches('!<title.*?' . t('Compose tips') . '.*?</title>!');
@@ -89,20 +89,20 @@ public function testUserLoginBlock() {
     // Log out again and repeat with a non-403 page including query arguments.
     $this->drupalLogout();
     $this->drupalGet('filter/tips', ['query' => ['foo' => 'bar']]);
-    self::assertEquals('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
+    $this->assertEquals('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
     $this->drupalPostForm(NULL, $edit, t('Log in'));
     $web_assert->pageTextNotContains(t('User login'));
     $web_assert->responseMatches('!<title.*?' . t('Compose tips') . '.*?</title>!');
-    self::assertTrue(strpos($this->getUrl(), '/filter/tips?foo=bar') !== FALSE, 'Correct query arguments are displayed after login');
+    $this->assertTrue(strpos($this->getUrl(), '/filter/tips?foo=bar') !== FALSE, 'Correct query arguments are displayed after login');
 
     // Repeat with different query arguments.
     $this->drupalLogout();
     $this->drupalGet('filter/tips', ['query' => ['foo' => 'baz']]);
-    self::assertEquals('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
+    $this->assertEquals('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
     $this->drupalPostForm(NULL, $edit, t('Log in'));
     $web_assert->pageTextNotContains(t('User login'));
     $web_assert->responseMatches('!<title.*?' . t('Compose tips') . '.*?</title>!');
-    self::assertTrue(strpos($this->getUrl(), '/filter/tips?foo=baz') !== FALSE);
+    $this->assertTrue(strpos($this->getUrl(), '/filter/tips?foo=baz') !== FALSE);
 
     // Check that the user login block is not vulnerable to information
     // disclosure to third party sites.
@@ -151,7 +151,7 @@ public function testWhosOnlineBlock() {
     $web_assert->pageTextContains($user1->getUsername());
     $web_assert->pageTextContains($user2->getUsername());
     $web_assert->pageTextNotContains($user3->getUsername());
-    self::assertTrue(strpos($this->getSession()->getPage()->getContent(), $user1->getUsername()) > strpos($this->getSession()->getPage()->getContent(), $user2->getUsername()), 'Online users are ordered correctly.');
+    $this->assertTrue(strpos($this->getSession()->getPage()->getContent(), $user1->getUsername()) > strpos($this->getSession()->getPage()->getContent(), $user2->getUsername()), 'Online users are ordered correctly.');
   }
 
   /**