diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
similarity index 95%
rename from core/modules/field/src/Tests/Number/NumberFieldTest.php
rename to core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
index 64da6c1a00..341d7ea6c2 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\field\Tests\Number;
+namespace Drupal\Tests\field\Functional\Number;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the creation of numeric fields.
  *
  * @group field
  */
-class NumberFieldTest extends WebTestBase {
+class NumberFieldTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -78,7 +78,7 @@ public function testNumberDecimalField() {
       "{$field_name}[0][value]" => $value,
     ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
     $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $this->assertRaw($value, 'Value is displayed.');
@@ -190,7 +190,7 @@ public function testNumberIntegerField() {
       "{$field_name}[0][value]" => $value,
     ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
     $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
 
@@ -239,7 +239,7 @@ public function testNumberIntegerField() {
         "{$field_name}[0][value]" => $valid_entry,
       ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
-      preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+      preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
       $id = $match[1];
       $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
       $this->assertRaw($valid_entry, 'Value is displayed.');
@@ -261,7 +261,7 @@ public function testNumberIntegerField() {
       "{$field_name}[0][value]" => $integer_value,
     ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
     $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $this->drupalGet('entity_test/' . $id);
@@ -312,7 +312,7 @@ public function testNumberFloatField() {
       "{$field_name}[0][value]" => $value,
     ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
     $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
 
@@ -448,14 +448,14 @@ public function testNumberFormatter() {
     $decimal_separator = $decimal_separators[array_rand($decimal_separators)];
     $scale = rand(0, 10);
 
-    $this->drupalPostAjaxForm(NULL, [], "${float_field}_settings_edit");
+    $this->drupalPostForm(NULL, [], "${float_field}_settings_edit");
     $edit = [
       "fields[${float_field}][settings_edit_form][settings][prefix_suffix]" => TRUE,
       "fields[${float_field}][settings_edit_form][settings][scale]" => $scale,
       "fields[${float_field}][settings_edit_form][settings][decimal_separator]" => $decimal_separator,
       "fields[${float_field}][settings_edit_form][settings][thousand_separator]" => $thousand_separator,
     ];
-    $this->drupalPostAjaxForm(NULL, $edit, "${float_field}_plugin_settings_update");
+    $this->drupalPostForm(NULL, $edit, "${float_field}_plugin_settings_update");
     $this->drupalPostForm(NULL, [], t('Save'));
 
     // Check number_decimal and number_unformatted formatters behavior.
@@ -474,12 +474,12 @@ public function testNumberFormatter() {
 
     $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
 
-    $this->drupalPostAjaxForm(NULL, [], "${integer_field}_settings_edit");
+    $this->drupalPostForm(NULL, [], "${integer_field}_settings_edit");
     $edit = [
       "fields[${integer_field}][settings_edit_form][settings][prefix_suffix]" => FALSE,
       "fields[${integer_field}][settings_edit_form][settings][thousand_separator]" => $thousand_separator,
     ];
-    $this->drupalPostAjaxForm(NULL, $edit, "${integer_field}_plugin_settings_update");
+    $this->drupalPostForm(NULL, $edit, "${integer_field}_plugin_settings_update");
     $this->drupalPostForm(NULL, [], t('Save'));
 
     // Check number_integer formatter behavior.