diff --git a/src/Tests/PathautoUnitTest.php b/tests/src/Kernel/PathautoKernelTest.php
similarity index 98%
rename from src/Tests/PathautoUnitTest.php
rename to tests/src/Kernel/PathautoKernelTest.php
index 49ce740..42e29c2 100644
--- a/src/Tests/PathautoUnitTest.php
+++ b/tests/src/Kernel/PathautoKernelTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\pathauto\Tests\PathautoUnitTest.
+ * Contains \Drupal\Tests\pathauto\Kernel\PathautoKernelTest.
  */
 
-namespace Drupal\pathauto\Tests;
+namespace Drupal\Tests\pathauto\Kernel;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
@@ -17,7 +17,8 @@ use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\NodeType;
 use Drupal\pathauto\PathautoGeneratorInterface;
 use Drupal\pathauto\PathautoState;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\pathauto\Tests\PathautoTestHelperTrait;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
 
@@ -26,7 +27,7 @@ use Drupal\taxonomy\Entity\Vocabulary;
  *
  * @group pathauto
  */
-class PathautoUnitTest extends KernelTestBase {
+class PathautoKernelTest extends KernelTestBase {
 
   use PathautoTestHelperTrait;
 
diff --git a/src/Tests/PathautoTokenTest.php b/tests/src/Kernel/PathautoTokenTest.php
similarity index 95%
rename from src/Tests/PathautoTokenTest.php
rename to tests/src/Kernel/PathautoTokenTest.php
index 2ae50c9..5d60a4d 100644
--- a/src/Tests/PathautoTokenTest.php
+++ b/tests/src/Kernel/PathautoTokenTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\pathauto\Tests\PathautoTokenTest.
+ * Contains \Drupal\Tests\pathauto\Kernel\PathautoTokenTest.
  */
 
-namespace Drupal\pathauto\Tests;
+namespace Drupal\Tests\pathauto\Kernel;
 
 use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests tokens provided by Pathauto.
diff --git a/tests/src/VerboseMessengerTest.php b/tests/src/Unit/VerboseMessengerTest.php
similarity index 97%
rename from tests/src/VerboseMessengerTest.php
rename to tests/src/Unit/VerboseMessengerTest.php
index e71cb3f..d3f680d 100644
--- a/tests/src/VerboseMessengerTest.php
+++ b/tests/src/Unit/VerboseMessengerTest.php
@@ -5,7 +5,7 @@
  * Contains Drupal\pathauto\VerboseMessengerTest
  */
 
-namespace Drupal\Tests\pathauto {
+namespace Drupal\Tests\pathauto\Unit {
 
   use Drupal\pathauto\VerboseMessenger;
   use Drupal\Tests\UnitTestCase;