diff --git a/core/modules/field/lib/Drupal/field/Tests/EmailFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/Fields/EmailFieldTest.php
similarity index 97%
rename from core/modules/field/lib/Drupal/field/Tests/EmailFieldTest.php
rename to core/modules/field/lib/Drupal/field/Tests/Fields/EmailFieldTest.php
index bc9c4fe..29e1b52 100644
--- a/core/modules/field/lib/Drupal/field/Tests/EmailFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Fields/EmailFieldTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\EmailFieldTest.
+ * Contains \Drupal\field\Tests\Fields\EmailFieldTest.
  */
 
-namespace Drupal\field\Tests;
+namespace Drupal\field\Tests\Fields;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/EmailItemTest.php b/core/modules/field/lib/Drupal/field/Tests/Fields/EmailItemTest.php
similarity index 94%
rename from core/modules/field/lib/Drupal/field/Tests/EmailItemTest.php
rename to core/modules/field/lib/Drupal/field/Tests/Fields/EmailItemTest.php
index 9c6d8a7..7474fad 100644
--- a/core/modules/field/lib/Drupal/field/Tests/EmailItemTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Fields/EmailItemTest.php
@@ -2,13 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\EmailItemTest.
+ * Contains \Drupal\field\Tests\Fields\EmailItemTest.
  */
 
-namespace Drupal\field\Tests;
+namespace Drupal\field\Tests\Fields;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldItemInterface;
+use Drupal\field\Tests\FieldUnitTestBase;
 
 /**
  * Tests the new entity API for the email field type.
diff --git a/core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/Fields/NumberFieldTest.php
similarity index 99%
rename from core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php
rename to core/modules/field/lib/Drupal/field/Tests/Fields/NumberFieldTest.php
index 531af43..533ce2b 100644
--- a/core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Fields/NumberFieldTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\NumberFieldTest.
+ * Contains \Drupal\field\Tests\Fields\NumberFieldTest.
  */
 
-namespace Drupal\field\Tests;
+namespace Drupal\field\Tests\Fields;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/NumberItemTest.php b/core/modules/field/lib/Drupal/field/Tests/Fields/NumberItemTest.php
similarity index 96%
rename from core/modules/field/lib/Drupal/field/Tests/NumberItemTest.php
rename to core/modules/field/lib/Drupal/field/Tests/Fields/NumberItemTest.php
index d6c45fd..ac54122 100644
--- a/core/modules/field/lib/Drupal/field/Tests/NumberItemTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Fields/NumberItemTest.php
@@ -2,13 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\NumberItemTest.
+ * Contains \Drupal\field\Tests\Fields\NumberItemTest.
  */
 
-namespace Drupal\field\Tests;
+namespace Drupal\field\Tests\Fields;
 
 use Drupal\Core\Field\FieldItemInterface;
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\field\Tests\FieldUnitTestBase;
 
 /**
  * Tests the new entity API for the number field type.