diff --git a/tests/Entity/AbstractTokenTest.php b/tests/Entity/AbstractTokenEntityTest.php
similarity index 100%
rename from tests/Entity/AbstractTokenTest.php
rename to tests/Entity/AbstractTokenEntityTest.php
diff --git a/tests/Entity/AccessTokenTest.php b/tests/Entity/AccessTokenEntityTest.php
similarity index 100%
rename from tests/Entity/AccessTokenTest.php
rename to tests/Entity/AccessTokenEntityTest.php
diff --git a/tests/Entity/AuthCodeTest.php b/tests/Entity/AuthCodeEntityTest.php
similarity index 100%
rename from tests/Entity/AuthCodeTest.php
rename to tests/Entity/AuthCodeEntityTest.php
diff --git a/tests/Entity/ClientTest.php b/tests/Entity/ClientEntityTest.php
similarity index 100%
rename from tests/Entity/ClientTest.php
rename to tests/Entity/ClientEntityTest.php
diff --git a/tests/Entity/RefreshTokenTest.php b/tests/Entity/RefreshTokenEntityTest.php
similarity index 100%
rename from tests/Entity/RefreshTokenTest.php
rename to tests/Entity/RefreshTokenEntityTest.php
diff --git a/tests/Entity/ScopeTest.php b/tests/Entity/ScopeEntityTest.php
similarity index 100%
rename from tests/Entity/ScopeTest.php
rename to tests/Entity/ScopeEntityTest.php
diff --git a/tests/Entity/SessionTest.php b/tests/Entity/SessionEntityTest.php
similarity index 100%
rename from tests/Entity/SessionTest.php
rename to tests/Entity/SessionEntityTest.php
diff --git a/tests/Grant/AuthCodeTest.php b/tests/Grant/AuthCodeGrantTest.php
similarity index 100%
rename from tests/Grant/AuthCodeTest.php
rename to tests/Grant/AuthCodeGrantTest.php
diff --git a/tests/Grant/ClientCredentialsTest.php b/tests/Grant/ClientCredentialsGrantTest.php
similarity index 100%
rename from tests/Grant/ClientCredentialsTest.php
rename to tests/Grant/ClientCredentialsGrantTest.php
diff --git a/tests/Grant/PasswordTest.php b/tests/Grant/PasswordGrantTest.php
similarity index 100%
rename from tests/Grant/PasswordTest.php
rename to tests/Grant/PasswordGrantTest.php
diff --git a/tests/Grant/RefreshTokenTest.php b/tests/Grant/RefreshTokenGrantTest.php
similarity index 100%
rename from tests/Grant/RefreshTokenTest.php
rename to tests/Grant/RefreshTokenGrantTest.php