diff --git a/src/Tests/NameAdminTest.php b/tests/src/Functional/NameAdminTest.php
similarity index 100%
rename from src/Tests/NameAdminTest.php
rename to tests/src/Functional/NameAdminTest.php
diff --git a/src/Tests/NameFieldTest.php b/tests/src/Functional/NameFieldTest.php
similarity index 100%
rename from src/Tests/NameFieldTest.php
rename to tests/src/Functional/NameFieldTest.php
diff --git a/src/Tests/NameNodeTokenReplaceTest.php b/tests/src/Functional/NameNodeTokenReplaceTest.php
similarity index 99%
rename from src/Tests/NameNodeTokenReplaceTest.php
rename to tests/src/Functional/NameNodeTokenReplaceTest.php
index 39a12cc..99b4b3c 100644
--- a/src/Tests/NameNodeTokenReplaceTest.php
+++ b/tests/src/Functional/NameNodeTokenReplaceTest.php
@@ -6,7 +6,6 @@ use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\Tests\name\Traits\NameTestTrait;
 
 /**
  * Tests text replacements in content to check node name token replacement.
diff --git a/src/Tests/NameOptionsProviderTest.php b/tests/src/Functional/NameOptionsProviderTest.php
similarity index 98%
rename from src/Tests/NameOptionsProviderTest.php
rename to tests/src/Functional/NameOptionsProviderTest.php
index 49c31c1..aa30413 100644
--- a/src/Tests/NameOptionsProviderTest.php
+++ b/tests/src/Functional/NameOptionsProviderTest.php
@@ -4,7 +4,6 @@ namespace Drupal\Tests\name\Functional;
 
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\Tests\name\Traits\NameTestTrait;
 
 /**
  * Tests NameOptionsProvider class.
diff --git a/src/Tests/NameTestBase.php b/tests/src/Functional/NameTestBase.php
similarity index 100%
rename from src/Tests/NameTestBase.php
rename to tests/src/Functional/NameTestBase.php
diff --git a/src/Tests/NameTestTrait.php b/tests/src/Functional/NameTestTrait.php
similarity index 97%
rename from src/Tests/NameTestTrait.php
rename to tests/src/Functional/NameTestTrait.php
index 02616c5..4d8698f 100644
--- a/src/Tests/NameTestTrait.php
+++ b/tests/src/Functional/NameTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\name\Traits;
+namespace Drupal\Tests\name\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/src/Tests/NameWidgetTest.php b/tests/src/Functional/NameWidgetTest.php
similarity index 100%
rename from src/Tests/NameWidgetTest.php
rename to tests/src/Functional/NameWidgetTest.php
diff --git a/src/Tests/NameAutocompleteTest.php b/tests/src/Kernel/NameAutocompleteTest.php
similarity index 98%
rename from src/Tests/NameAutocompleteTest.php
rename to tests/src/Kernel/NameAutocompleteTest.php
index 3f86952..8a3dd41 100644
--- a/src/Tests/NameAutocompleteTest.php
+++ b/tests/src/Kernel/NameAutocompleteTest.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests\name\Kernel;
 
 use Drupal\name\Controller\NameAutocompleteController;
 use Drupal\KernelTests\KernelTestBase;
-use Drupal\Tests\name\Traits\NameTestTrait;
+use Drupal\Tests\name\Functional\NameTestTrait;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
diff --git a/src/Tests/NameUserTest.php b/tests/src/Kernel/NameUserTest.php
similarity index 100%
rename from src/Tests/NameUserTest.php
rename to tests/src/Kernel/NameUserTest.php
diff --git a/src/Tests/NameFormatParserTest.php b/tests/src/Unit/NameFormatParserTest.php
similarity index 100%
rename from src/Tests/NameFormatParserTest.php
rename to tests/src/Unit/NameFormatParserTest.php
diff --git a/src/Tests/NameUnicodeExtrasTest.php b/tests/src/Unit/NameUnicodeExtrasTest.php
similarity index 100%
rename from src/Tests/NameUnicodeExtrasTest.php
rename to tests/src/Unit/NameUnicodeExtrasTest.php