diff --git a/core/modules/field/lib/Drupal/field/Tests/Fields/EmailFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/EmailFieldTest.php
similarity index 96%
rename from core/modules/field/lib/Drupal/field/Tests/Fields/EmailFieldTest.php
rename to core/modules/field/lib/Drupal/field/Tests/FieldTypes/EmailFieldTest.php
index 29e1b52..ef4ccad 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Fields/EmailFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/EmailFieldTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Fields\EmailFieldTest.
+ * Contains \Drupal\field\Tests\FieldTypes\EmailFieldTest.
  */
 
-namespace Drupal\field\Tests\Fields;
+namespace Drupal\field\Tests\FieldTypes;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/Fields/EmailItemTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/EmailItemTest.php
similarity index 96%
rename from core/modules/field/lib/Drupal/field/Tests/Fields/EmailItemTest.php
rename to core/modules/field/lib/Drupal/field/Tests/FieldTypes/EmailItemTest.php
index 7474fad..bac9510 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Fields/EmailItemTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/EmailItemTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Fields\EmailItemTest.
+ * Contains \Drupal\field\Tests\FieldTypes\EmailItemTest.
  */
 
-namespace Drupal\field\Tests\Fields;
+namespace Drupal\field\Tests\FieldTypes;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldItemInterface;
diff --git a/core/modules/field/lib/Drupal/field/Tests/Fields/NumberFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/NumberFieldTest.php
similarity index 99%
rename from core/modules/field/lib/Drupal/field/Tests/Fields/NumberFieldTest.php
rename to core/modules/field/lib/Drupal/field/Tests/FieldTypes/NumberFieldTest.php
index 533ce2b..19c2d89 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Fields/NumberFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/NumberFieldTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Fields\NumberFieldTest.
+ * Contains \Drupal\field\Tests\FieldTypes\NumberFieldTest.
  */
 
-namespace Drupal\field\Tests\Fields;
+namespace Drupal\field\Tests\FieldTypes;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/Fields/NumberItemTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/NumberItemTest.php
similarity index 97%
rename from core/modules/field/lib/Drupal/field/Tests/Fields/NumberItemTest.php
rename to core/modules/field/lib/Drupal/field/Tests/FieldTypes/NumberItemTest.php
index ac54122..0938860 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Fields/NumberItemTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldTypes/NumberItemTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\Fields\NumberItemTest.
+ * Contains \Drupal\field\Tests\FieldTypes\NumberItemTest.
  */
 
-namespace Drupal\field\Tests\Fields;
+namespace Drupal\field\Tests\FieldTypes;
 
 use Drupal\Core\Field\FieldItemInterface;
 use Drupal\Core\Field\FieldItemListInterface;