diff --git a/tests/Authentication/AccessTokenAuthenticatorTest.php b/tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php
similarity index 99%
rename from tests/Authentication/AccessTokenAuthenticatorTest.php
rename to tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php
index aa97ab190..6bb8afded 100644
--- a/tests/Authentication/AccessTokenAuthenticatorTest.php
+++ b/tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Authentication;
+namespace Tests\Authentication\Authenticators;
 
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Shield\Authentication\Authentication;
diff --git a/tests/Authentication/SessionAuthenticatorTest.php b/tests/Authentication/Authenticators/SessionAuthenticatorTest.php
similarity index 99%
rename from tests/Authentication/SessionAuthenticatorTest.php
rename to tests/Authentication/Authenticators/SessionAuthenticatorTest.php
index 556ccee5b..ec75ad0ca 100644
--- a/tests/Authentication/SessionAuthenticatorTest.php
+++ b/tests/Authentication/Authenticators/SessionAuthenticatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Authentication;
+namespace Tests\Authentication\Authenticators;
 
 use CodeIgniter\Shield\Authentication\Authentication;
 use CodeIgniter\Shield\Authentication\AuthenticationException;
diff --git a/tests/Authentication/ChainFilterTest.php b/tests/Authentication/Filters/ChainFilterTest.php
similarity index 97%
rename from tests/Authentication/ChainFilterTest.php
rename to tests/Authentication/Filters/ChainFilterTest.php
index da7368f06..c583152c0 100644
--- a/tests/Authentication/ChainFilterTest.php
+++ b/tests/Authentication/Filters/ChainFilterTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Tests\Authentication;
+namespace Tests\Authentication\Filters;
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Shield\Entities\AccessToken;
-use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Shield\Filters\ChainAuth;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\FeatureTestTrait;
diff --git a/tests/Authentication/SessionFilterTest.php b/tests/Authentication/Filters/SessionFilterTest.php
similarity index 98%
rename from tests/Authentication/SessionFilterTest.php
rename to tests/Authentication/Filters/SessionFilterTest.php
index 202b97150..2e9b9966a 100644
--- a/tests/Authentication/SessionFilterTest.php
+++ b/tests/Authentication/Filters/SessionFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Authentication;
+namespace Tests\Authentication\Filters;
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Shield\Filters\SessionAuth;
diff --git a/tests/Authentication/TokenFilterTest.php b/tests/Authentication/Filters/TokenFilterTest.php
similarity index 98%
rename from tests/Authentication/TokenFilterTest.php
rename to tests/Authentication/Filters/TokenFilterTest.php
index 7463f83b3..42ef583df 100644
--- a/tests/Authentication/TokenFilterTest.php
+++ b/tests/Authentication/Filters/TokenFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Authentication;
+namespace Tests\Authentication\Filters;
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Shield\Entities\AccessToken;