diff --git a/core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
similarity index 97%
rename from core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
rename to core/modules/user/src/Tests/UserAdminSettingsFormTest.php
index a197d6cc07..b77411154c 100644
--- a/core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
+++ b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 use Drupal\system\Tests\System\SystemConfigFormTestBase;
 use Drupal\user\AccountSettingsForm;
diff --git a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
similarity index 99%
rename from core/modules/user/tests/src/Functional/UserPasswordResetTest.php
rename to core/modules/user/src/Tests/UserPasswordResetTest.php
index 409e418214..528d38bc96 100644
--- a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;
diff --git a/core/modules/user/tests/src/Functional/UserAdminListingTest.php b/core/modules/user/tests/src/Functional/UserAdminListingTest.php
index 8127a1dcd5..9f571bc0f0 100644
--- a/core/modules/user/tests/src/Functional/UserAdminListingTest.php
+++ b/core/modules/user/tests/src/Functional/UserAdminListingTest.php
@@ -62,21 +62,24 @@ public function testUserListing() {
 
     $result = $this->xpath('//table[contains(@class, "responsive-enabled")]/tbody/tr');
     $result_accounts = [];
-    foreach ($result as $account) {
-      $span = $this->xpath('//table/tbody/tr/td[1]/span');
-      $name = $span[0]->getText();
+    foreach ($result as $key => $account) {
+      $xpath_key = $key + 1;
+      $account_columns = $this->xpath("//table/tbody/tr[$xpath_key]/td");
+      $name = $account_columns[0]->getText();
       $roles = [];
-      if (isset($account->td[2]->div->ul)) {
-        foreach ($account->td[2]->div->ul->li as $element) {
-          $roles[] = (string) $element;
+      $account_roles = $this->xpath("//table/tbody/tr[$xpath_key]/td/div/ul/li");
+      if (!empty($account_roles)) {
+        foreach ($account_roles as $element) {
+          $roles[] = $element->getText();
         }
       }
+
       $result_accounts[$name] = [
         'name' => $name,
-        'status' => $account->getAttribute('td'),
+        'status' => $account_columns[1]->getHtml(),
         'roles' => $roles,
-        'member_for' => $account->getAttribute('td'),
-        'last_access' => $account->getAttribute('td'),
+        'member_for' => $account_columns[3]->getHtml(),
+        'last_access' => $account_columns[4]->getHtml(),
       ];
     }
 
diff --git a/core/modules/user/tests/src/Functional/UserCreateTest.php b/core/modules/user/tests/src/Functional/UserCreateTest.php
index 4f42feb3d9..1231d9cd80 100644
--- a/core/modules/user/tests/src/Functional/UserCreateTest.php
+++ b/core/modules/user/tests/src/Functional/UserCreateTest.php
@@ -66,8 +66,15 @@ public function testUserAdd() {
 
     // Test user creation page for valid fields.
     $this->drupalGet('admin/people/create');
-    $this->assertSession()->fieldValueEquals('edit-status-0', 0);
-    $this->assertSession()->fieldValueEquals('edit-status-1', 1);
+
+    $status_field_1_xpath = $this->assertSession()->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => 'edit-status-0']);
+    $status_field_1 = $this->getSession()->getPage()->find('xpath', $status_field_1_xpath);
+    $this->assertEquals($status_field_1->getAttribute('value'), 0);
+
+    $status_field_2_xpath = $this->assertSession()->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => 'edit-status-1']);
+    $status_field_2 = $this->getSession()->getPage()->find('xpath', $status_field_2_xpath);
+    $this->assertEquals($status_field_2->getAttribute('value'), 1);
+
     $this->assertFieldByXPath('//input[@type="radio" and @id="edit-status-1" and @checked="checked"]', NULL, 'Default setting for user status is active.');
 
     // Test that browser autocomplete behavior does not occur.
diff --git a/core/modules/user/tests/src/Functional/UserTranslationUITest.php b/core/modules/user/tests/src/Functional/UserTranslationUITest.php
index 02db314435..ae541da83e 100644
--- a/core/modules/user/tests/src/Functional/UserTranslationUITest.php
+++ b/core/modules/user/tests/src/Functional/UserTranslationUITest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\user\Functional;
 
-use Drupal\content_translation\Tests\ContentTranslationUITestBase;
+use Drupal\Tests\content_translation\Functional\ContentTranslationUITestBase;
 
 /**
  * Tests the User Translation UI.