diff --git a/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php b/core/modules/user/src/Tests/UserAdminLanguageTest.php
similarity index 80%
rename from core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
rename to core/modules/user/src/Tests/UserAdminLanguageTest.php
index 04b207524f..cd6cc657bf 100644
--- a/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
+++ b/core/modules/user/src/Tests/UserAdminLanguageTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests users' ability to change their own administration language.
  *
  * @group user
  */
-class UserAdminLanguageTest extends BrowserTestBase {
+class UserAdminLanguageTest extends WebTestBase {
 
   /**
    * A user with permission to access admin pages and administer languages.
@@ -50,11 +50,7 @@ public function testUserAdminLanguageConfigurationNotAvailableWithOnlyOneLanguag
     $path = 'user/' . $this->adminUser->id() . '/edit';
     $this->drupalGet($path);
     // Ensure administration pages language settings widget is not available.
-    $attribute = 'id';
-    $value = 'edit-preferred-admin-langcode';
-    $xpath = '//textarea[@' . $attribute . '=:value]|//input[@' . $attribute . '=:value]|//select[@' . $attribute . '=:value]';
-    $constructFieldXpath = $this->assertSession()->buildXPathQuery($xpath, [':value' => $value]);
-    $this->assertNoFieldByXPath($constructFieldXpath, NULL, 'Administration pages language selector not available.');
+    $this->assertNoFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector not available.');
   }
 
   /**
@@ -68,13 +64,13 @@ public function testUserAdminLanguageConfigurationAvailableWithAdminLanguageNego
     // Checks with user administration pages language negotiation disabled.
     $this->drupalGet($path);
     // Ensure administration pages language settings widget is not available.
-    $this->assertNoFieldByXPath($this->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => 'edit-preferred-admin-langcode']), NULL, 'Administration pages language selector not available.');
+    $this->assertNoFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector not available.');
 
     // Checks with user administration pages language negotiation enabled.
     $this->setLanguageNegotiation();
     $this->drupalGet($path);
     // Ensure administration pages language settings widget is available.
-    $this->assertFieldByXPath($this->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => 'edit-preferred-admin-langcode']), NULL, 'Administration pages language selector is available.');
+    $this->assertFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector is available.');
   }
 
   /**
@@ -95,13 +91,13 @@ public function testUserAdminLanguageConfigurationAvailableIfAdminLanguageNegoti
     $path = 'user/' . $this->adminUser->id() . '/edit';
     $this->drupalGet($path);
     // Ensure administration pages language setting is visible for admin.
-    $this->assertFieldByXPath($this->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => 'edit-preferred-admin-langcode']), NULL, 'Administration pages language selector available for admins.');
+    $this->assertFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector available for admins.');
 
     // Ensure administration pages language setting is hidden for non-admins.
     $this->drupalLogin($this->regularUser);
     $path = 'user/' . $this->regularUser->id() . '/edit';
     $this->drupalGet($path);
-    $this->assertNoFieldByXPath($this->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => 'edit-preferred-admin-langcode']), NULL, 'Administration pages language selector not available for regular user.');
+    $this->assertNoFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector not available for regular user.');
   }
 
   /**
diff --git a/core/modules/user/tests/src/Functional/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php
similarity index 82%
rename from core/modules/user/tests/src/Functional/UserCreateTest.php
rename to core/modules/user/src/Tests/UserCreateTest.php
index a081a3352b..7b534435a0 100644
--- a/core/modules/user/tests/src/Functional/UserCreateTest.php
+++ b/core/modules/user/src/Tests/UserCreateTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
-use Drupal\Core\Test\AssertMailTrait;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -12,11 +11,8 @@
  *
  * @group user
  */
-class UserCreateTest extends BrowserTestBase {
+class UserCreateTest extends WebTestBase {
 
-  use AssertMailTrait {
-    getMails as drupalGetMails;
-  }
   /**
    * Modules to enable.
    *
@@ -70,15 +66,8 @@ public function testUserAdd() {
 
     // Test user creation page for valid fields.
     $this->drupalGet('admin/people/create');
-
-    $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->assertFieldbyId('edit-status-0', 0, 'The user status option Blocked exists.', 'User login');
+    $this->assertFieldbyId('edit-status-1', 1, 'The user status option Active exists.', 'User login');
     $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.
@@ -120,7 +109,7 @@ public function testUserAdd() {
       $this->drupalGet('admin/people');
       $this->assertText($edit['name'], 'User found in list of users');
       $user = user_load_by_name($name);
-      $this->assertEqual($user->isActive(), TRUE, 'User is not blocked');
+      $this->assertEqual($user->isActive(), 'User is not blocked');
     }
 
     // Test that the password '0' is considered a password.