diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesApiTest.php b/core/modules/options/tests/src/Functional/OptionsDynamicValuesApiTest.php
similarity index 94%
rename from core/modules/options/src/Tests/OptionsDynamicValuesApiTest.php
rename to core/modules/options/tests/src/Functional/OptionsDynamicValuesApiTest.php
index c4215835fd6d..a96fd7a04b17 100644
--- a/core/modules/options/src/Tests/OptionsDynamicValuesApiTest.php
+++ b/core/modules/options/tests/src/Functional/OptionsDynamicValuesApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 /**
 * Tests the options allowed values api.
diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php b/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
similarity index 97%
rename from core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
rename to core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
index 2d3f0fbed711..64e90104cf6e 100644
--- a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
+++ b/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\FieldTestBase;
diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php b/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
similarity index 95%
rename from core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
rename to core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
index a7d7f3fe1821..9205011ed8a9 100644
--- a/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
+++ b/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 /**
  * Tests the Options field allowed values function.
diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
similarity index 99%
rename from core/modules/options/src/Tests/OptionsFieldUITest.php
rename to core/modules/options/tests/src/Functional/OptionsFieldUITest.php
index 1ba4cddfdb80..836740dc4418 100644
--- a/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php b/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
similarity index 98%
rename from core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
rename to core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
index 5a2f20b24adb..befd48e42aca 100644
--- a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
+++ b/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php b/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
similarity index 95%
rename from core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
rename to core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
index e526da398c98..b661c0d53625 100644
--- a/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
+++ b/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 /**
  * Tests an options select with a dynamic allowed values function.
diff --git a/core/modules/options/src/Tests/OptionsWidgetsTest.php b/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
similarity index 99%
rename from core/modules/options/src/Tests/OptionsWidgetsTest.php
rename to core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
index 48f9c1a1d770..a2157f1f918c 100644
--- a/core/modules/options/src/Tests/OptionsWidgetsTest.php
+++ b/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;