diff --git a/tests/TestCase/Controller/Traits/LinkSocialTrait.php b/tests/TestCase/Controller/Traits/LinkSocialTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/LinkSocialTrait.php
rename to tests/TestCase/Controller/Traits/LinkSocialTraitTest.php
index a3eba994..129d21d5 100644
--- a/tests/TestCase/Controller/Traits/LinkSocialTrait.php
+++ b/tests/TestCase/Controller/Traits/LinkSocialTraitTest.php
@@ -23,7 +23,7 @@
 use Laminas\Diactoros\Uri;
 use League\OAuth2\Client\Provider\FacebookUser;
 
-class LinkSocialTrait extends BaseTrait
+class LinkSocialTraitTest extends BaseTrait
 {
     /**
      * Fixtures
diff --git a/tests/TestCase/Controller/Traits/LoginTrait.php b/tests/TestCase/Controller/Traits/LoginTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/LoginTrait.php
rename to tests/TestCase/Controller/Traits/LoginTraitTest.php
index 3d508b47..b2ae5c83 100644
--- a/tests/TestCase/Controller/Traits/LoginTrait.php
+++ b/tests/TestCase/Controller/Traits/LoginTraitTest.php
@@ -27,7 +27,7 @@
 use CakeDC\Users\Authenticator\SocialAuthenticator;
 use CakeDC\Users\Controller\Component\LoginComponent;
 
-class LoginTrait extends BaseTrait
+class LoginTraitTest extends BaseTrait
 {
     /**
      * setup
diff --git a/tests/TestCase/Controller/Traits/OneTimePasswordVerifyTrait.php b/tests/TestCase/Controller/Traits/OneTimePasswordVerifyTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/OneTimePasswordVerifyTrait.php
rename to tests/TestCase/Controller/Traits/OneTimePasswordVerifyTraitTest.php
index f5c877f1..74a398b5 100644
--- a/tests/TestCase/Controller/Traits/OneTimePasswordVerifyTrait.php
+++ b/tests/TestCase/Controller/Traits/OneTimePasswordVerifyTraitTest.php
@@ -18,7 +18,7 @@
 use Cake\ORM\TableRegistry;
 use CakeDC\Auth\Controller\Component\OneTimePasswordAuthenticatorComponent;
 
-class OneTimePasswordVerifyTrait extends BaseTrait
+class OneTimePasswordVerifyTraitTest extends BaseTrait
 {
     protected array $loginPage = [
         'plugin' => 'CakeDC/Users',
diff --git a/tests/TestCase/Controller/Traits/PasswordManagementTrait.php b/tests/TestCase/Controller/Traits/PasswordManagementTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/PasswordManagementTrait.php
rename to tests/TestCase/Controller/Traits/PasswordManagementTraitTest.php
index d0dd4e20..f367340d 100644
--- a/tests/TestCase/Controller/Traits/PasswordManagementTrait.php
+++ b/tests/TestCase/Controller/Traits/PasswordManagementTraitTest.php
@@ -19,7 +19,7 @@
 use Cake\Http\ServerRequest;
 use Cake\TestSuite\TestCase;
 
-class PasswordManagementTrait extends BaseTrait
+class PasswordManagementTraitTest extends BaseTrait
 {
     /**
      * @var \CakeDC\Users\Controller\UsersController
diff --git a/tests/TestCase/Controller/Traits/ProfileTrait.php b/tests/TestCase/Controller/Traits/ProfileTraitTest.php
similarity index 98%
rename from tests/TestCase/Controller/Traits/ProfileTrait.php
rename to tests/TestCase/Controller/Traits/ProfileTraitTest.php
index ecbe329e..4c0178ef 100644
--- a/tests/TestCase/Controller/Traits/ProfileTrait.php
+++ b/tests/TestCase/Controller/Traits/ProfileTraitTest.php
@@ -18,7 +18,7 @@
 /**
  * @property \CakeDC\Users\Controller\Traits\ProfileTrait&\PHPUnit\Framework\MockObject\MockObject $Trait
  */
-class ProfileTrait extends BaseTrait
+class ProfileTraitTest extends BaseTrait
 {
     /**
      * Fixtures
diff --git a/tests/TestCase/Controller/Traits/RegisterTrait.php b/tests/TestCase/Controller/Traits/RegisterTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/RegisterTrait.php
rename to tests/TestCase/Controller/Traits/RegisterTraitTest.php
index 264d45d2..e3d7a0ee 100644
--- a/tests/TestCase/Controller/Traits/RegisterTrait.php
+++ b/tests/TestCase/Controller/Traits/RegisterTraitTest.php
@@ -19,7 +19,7 @@
 use Cake\Http\ServerRequest;
 use Cake\Routing\Router;
 
-class RegisterTrait extends BaseTrait
+class RegisterTraitTest extends BaseTrait
 {
     /**
      * setUp
diff --git a/tests/TestCase/Controller/Traits/SimpleCrudTrait.php b/tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/SimpleCrudTrait.php
rename to tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php
index 2c42b0cd..4a2a318e 100644
--- a/tests/TestCase/Controller/Traits/SimpleCrudTrait.php
+++ b/tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php
@@ -24,7 +24,7 @@
  * @package CakeDC\Users\Test\TestCase\Controller\Traits
  * @property \CakeDC\Users\Controller\Traits\SimpleCrudTrait&\PHPUnit\Framework\MockObject\MockObject $Trait
  */
-class SimpleCrudTrait extends BaseTrait
+class SimpleCrudTraitTest extends BaseTrait
 {
     public $viewVars;
 
diff --git a/tests/TestCase/Controller/Traits/SocialTrait.php b/tests/TestCase/Controller/Traits/SocialTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/SocialTrait.php
rename to tests/TestCase/Controller/Traits/SocialTraitTest.php
index 73f49d8c..bf8fa673 100644
--- a/tests/TestCase/Controller/Traits/SocialTrait.php
+++ b/tests/TestCase/Controller/Traits/SocialTraitTest.php
@@ -25,7 +25,7 @@
 use CakeDC\Users\Authenticator\SocialAuthenticator;
 use CakeDC\Users\Controller\Component\LoginComponent;
 
-class SocialTrait extends BaseTrait
+class SocialTraitTest extends BaseTrait
 {
     /**
      * Fixtures
diff --git a/tests/TestCase/Controller/Traits/UserValidationTrait.php b/tests/TestCase/Controller/Traits/UserValidationTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/UserValidationTrait.php
rename to tests/TestCase/Controller/Traits/UserValidationTraitTest.php
index 7351ba9b..f8d95566 100644
--- a/tests/TestCase/Controller/Traits/UserValidationTrait.php
+++ b/tests/TestCase/Controller/Traits/UserValidationTraitTest.php
@@ -15,7 +15,7 @@
 
 use Cake\Event\Event;
 
-class UserValidationTrait extends BaseTrait
+class UserValidationTraitTest extends BaseTrait
 {
     /**
      * @var \CakeDC\Users\Controller\UsersController
diff --git a/tests/TestCase/Controller/Traits/Webauthn2FaTrait.php b/tests/TestCase/Controller/Traits/Webauthn2FaTraitTest.php
similarity index 99%
rename from tests/TestCase/Controller/Traits/Webauthn2FaTrait.php
rename to tests/TestCase/Controller/Traits/Webauthn2FaTraitTest.php
index c098b39c..6dfa19bf 100644
--- a/tests/TestCase/Controller/Traits/Webauthn2FaTrait.php
+++ b/tests/TestCase/Controller/Traits/Webauthn2FaTraitTest.php
@@ -29,7 +29,7 @@
  *
  * @package App\Test\TestCase\Controller\Traits
  */
-class Webauthn2FaTrait extends BaseTrait
+class Webauthn2FaTraitTest extends BaseTrait
 {
     /**
      * Fixtures