diff --git a/core/modules/field/tests/src/Functional/String/StringFieldTest.php b/core/modules/field/tests/src/Functional/FunctionalString/StringFieldTest.php
similarity index 98%
rename from core/modules/field/tests/src/Functional/String/StringFieldTest.php
rename to core/modules/field/tests/src/Functional/FunctionalString/StringFieldTest.php
index ae8741b7205..f7f9f0f9af7 100644
--- a/core/modules/field/tests/src/Functional/String/StringFieldTest.php
+++ b/core/modules/field/tests/src/Functional/FunctionalString/StringFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Functional\String;
+namespace Drupal\Tests\field\Functional\FunctionalString;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\entity_test\Entity\EntityTest;
diff --git a/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php b/core/modules/field/tests/src/Kernel/KernelString/RawStringFormatterTest.php
similarity index 98%
rename from core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
rename to core/modules/field/tests/src/Kernel/KernelString/RawStringFormatterTest.php
index 1f07902108f..7bdaba59564 100644
--- a/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/KernelString/RawStringFormatterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Kernel\String;
+namespace Drupal\Tests\field\Kernel\KernelString;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
diff --git a/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php b/core/modules/field/tests/src/Kernel/KernelString/StringFormatterTest.php
similarity index 99%
rename from core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
rename to core/modules/field/tests/src/Kernel/KernelString/StringFormatterTest.php
index a01cd6a8f5d..94878dbd127 100644
--- a/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/KernelString/StringFormatterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Kernel\String;
+namespace Drupal\Tests\field\Kernel\KernelString;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
diff --git a/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php b/core/modules/field/tests/src/Kernel/KernelString/UuidFormatterTest.php
similarity index 97%
rename from core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
rename to core/modules/field/tests/src/Kernel/KernelString/UuidFormatterTest.php
index fa37b11d6c4..8346a414801 100644
--- a/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/KernelString/UuidFormatterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Kernel\String;
+namespace Drupal\Tests\field\Kernel\KernelString;
 
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\KernelTests\KernelTestBase;
diff --git a/core/modules/field/tests/src/Kernel/String/UuidItemTest.php b/core/modules/field/tests/src/Kernel/KernelString/UuidItemTest.php
similarity index 91%
rename from core/modules/field/tests/src/Kernel/String/UuidItemTest.php
rename to core/modules/field/tests/src/Kernel/KernelString/UuidItemTest.php
index 480057b90a4..6cdb32b004f 100644
--- a/core/modules/field/tests/src/Kernel/String/UuidItemTest.php
+++ b/core/modules/field/tests/src/Kernel/KernelString/UuidItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Kernel\String;
+namespace Drupal\Tests\field\Kernel\KernelString;
 
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\Tests\field\Kernel\FieldKernelTestBase;
diff --git a/core/modules/text/tests/src/Functional/TextFieldTest.php b/core/modules/text/tests/src/Functional/TextFieldTest.php
index ab9ba107a3e..c62a9c8ede1 100644
--- a/core/modules/text/tests/src/Functional/TextFieldTest.php
+++ b/core/modules/text/tests/src/Functional/TextFieldTest.php
@@ -8,7 +8,7 @@ use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\filter\Render\FilteredMarkup;
-use Drupal\Tests\field\Functional\String\StringFieldTest;
+use Drupal\Tests\field\Functional\FunctionalString\StringFieldTest;
 use Drupal\Tests\TestFileCreationTrait;
 
 /**