diff --git a/core/modules/user/tests/src/Functional/UserRequirementsTest.php b/core/modules/user/tests/src/Functional/UserRequirementsTest.php
index ac126771ca7..ea03b448ef4 100644
--- a/core/modules/user/tests/src/Functional/UserRequirementsTest.php
+++ b/core/modules/user/tests/src/Functional/UserRequirementsTest.php
@@ -13,14 +13,6 @@ use Drupal\Tests\BrowserTestBase;
  */
 class UserRequirementsTest extends BrowserTestBase {
 
-  /**
-   * {@inheritdoc}
-   *
-   * @todo Remove and fix test to not rely on super user.
-   * @see https://www.drupal.org/project/drupal/issues/3437620
-   */
-  protected bool $usesSuperUserAccessPolicy = TRUE;
-
   /**
    * {@inheritdoc}
    */
@@ -36,7 +28,10 @@ class UserRequirementsTest extends BrowserTestBase {
       ->condition('uid', 0)
       ->execute();
 
-    $this->drupalLogin($this->rootUser);
+    $this->drupalLogin($this->drupalCreateUser([
+      'access administration pages',
+      'administer site configuration',
+    ]));
     $this->drupalGet('/admin/reports/status');
     $this->assertSession()->statusCodeEquals(200);
     $this->assertSession()->pageTextContains("The anonymous user does not exist.");
diff --git a/core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php b/core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php
index 8fa4bce22bd..179bda8607b 100644
--- a/core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php
+++ b/core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php
@@ -6,6 +6,7 @@ namespace Drupal\Tests\user\Kernel;
 
 use Drupal\block\Entity\Block;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\user\Traits\UserCreationTrait;
 use Drupal\user\Entity\User;
 
 /**
@@ -14,20 +15,13 @@ use Drupal\user\Entity\User;
  * @group user
  */
 class WhoIsOnlineBlockTest extends KernelTestBase {
+  use UserCreationTrait;
 
   /**
    * {@inheritdoc}
    */
   protected static $modules = ['system', 'user', 'block', 'views'];
 
-  /**
-   * {@inheritdoc}
-   *
-   * @todo Remove and fix test to not rely on super user.
-   * @see https://www.drupal.org/project/drupal/issues/3437620
-   */
-  protected bool $usesSuperUserAccessPolicy = TRUE;
-
   /**
    * The block being tested.
    *
@@ -86,8 +80,8 @@ class WhoIsOnlineBlockTest extends KernelTestBase {
     $user1 = User::create([
       'name' => 'user1',
       'mail' => 'user1@example.com',
+      'roles' => [$this->createRole(['access user profiles'])],
     ]);
-    $user1->addRole('administrator');
     $user1->activate();
     $requestTime = \Drupal::time()->getRequestTime();
     $user1->setLastAccessTime($requestTime);