diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e4944f6c..da867948 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-        backupGlobals="false"
-        colors="true"
-        bootstrap="vendor/autoload.php"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    cacheResultFile=".phpunit.cache/test-results"
+    executionOrder="depends,defects"
+    beStrictAboutCoversAnnotation="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTodoAnnotatedTests="true"
+    convertDeprecationsToExceptions="true"
+    failOnRisky="true"
+    failOnWarning="true"
+    verbose="true"
+    colors="true"
 >
-
     <php>
         <ini name="error_reporting" value="-1"/>
         <server name="SHELL_VERBOSITY" value="-1"/>
@@ -15,31 +21,30 @@
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
     </php>
 
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src/</directory>
-        </include>
-        <exclude>
-            <directory>./src/Resources</directory>
-            <directory>./tests</directory>
-            <directory>./vendor</directory>
-        </exclude>
-    </coverage>
-
     <testsuites>
         <testsuite name="all">
             <directory>./tests</directory>
         </testsuite>
         <testsuite name="unit">
-            <directory>./tests/UnitTests</directory>
+            <directory>./tests/Unit</directory>
         </testsuite>
         <testsuite name="functional">
-            <directory>./tests/FunctionalTests</directory>
+            <directory>./tests/Functional</directory>
         </testsuite>
         <testsuite name="integration">
-            <directory>./tests/IntegrationTests</directory>
+            <directory>./tests/Integration</directory>
         </testsuite>
     </testsuites>
+
+    <coverage
+        cacheDirectory=".phpunit.cache/code-coverage"
+        processUncoveredFiles="true"
+    >
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>
diff --git a/tests/FunctionalTests/Command/ResetPasswordRemoveExpiredCommandTest.php b/tests/Functional/Command/ResetPasswordRemoveExpiredCommandTest.php
similarity index 100%
rename from tests/FunctionalTests/Command/ResetPasswordRemoveExpiredCommandTest.php
rename to tests/Functional/Command/ResetPasswordRemoveExpiredCommandTest.php
diff --git a/tests/FunctionalTests/Persistence/ResetPasswordRequestRepositoryTest.php b/tests/Functional/Persistence/ResetPasswordRequestRepositoryTest.php
similarity index 100%
rename from tests/FunctionalTests/Persistence/ResetPasswordRequestRepositoryTest.php
rename to tests/Functional/Persistence/ResetPasswordRequestRepositoryTest.php
diff --git a/tests/IntegrationTests/ResetPasswordInterfaceAutowireTest.php b/tests/Integration/ResetPasswordInterfaceAutowireTest.php
similarity index 94%
rename from tests/IntegrationTests/ResetPasswordInterfaceAutowireTest.php
rename to tests/Integration/ResetPasswordInterfaceAutowireTest.php
index ce955fd0..e6df2526 100644
--- a/tests/IntegrationTests/ResetPasswordInterfaceAutowireTest.php
+++ b/tests/Integration/ResetPasswordInterfaceAutowireTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\IntegrationTests;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Integration;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/tests/IntegrationTests/ResetPasswordServiceDefinitionTest.php b/tests/Integration/ResetPasswordServiceDefinitionTest.php
similarity index 97%
rename from tests/IntegrationTests/ResetPasswordServiceDefinitionTest.php
rename to tests/Integration/ResetPasswordServiceDefinitionTest.php
index 4f20958d..0b07dd2e 100644
--- a/tests/IntegrationTests/ResetPasswordServiceDefinitionTest.php
+++ b/tests/Integration/ResetPasswordServiceDefinitionTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\IntegrationTests;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Integration;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
diff --git a/tests/UnitTests/Command/ResetPasswordRemoveExpiredCommandTest.php b/tests/Unit/Command/ResetPasswordRemoveExpiredCommandTest.php
similarity index 95%
rename from tests/UnitTests/Command/ResetPasswordRemoveExpiredCommandTest.php
rename to tests/Unit/Command/ResetPasswordRemoveExpiredCommandTest.php
index 0fbd780b..55a98120 100644
--- a/tests/UnitTests/Command/ResetPasswordRemoveExpiredCommandTest.php
+++ b/tests/Unit/Command/ResetPasswordRemoveExpiredCommandTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Command;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Command;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/tests/UnitTests/Controller/ResetPasswordControllerTraitTest.php b/tests/Unit/Controller/ResetPasswordControllerTraitTest.php
similarity index 98%
rename from tests/UnitTests/Controller/ResetPasswordControllerTraitTest.php
rename to tests/Unit/Controller/ResetPasswordControllerTraitTest.php
index 4eca2ada..7ed19712 100644
--- a/tests/UnitTests/Controller/ResetPasswordControllerTraitTest.php
+++ b/tests/Unit/Controller/ResetPasswordControllerTraitTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Controller;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Controller;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/UnitTests/Exception/ResetPasswordExceptionTest.php b/tests/Unit/Exception/ResetPasswordExceptionTest.php
similarity index 96%
rename from tests/UnitTests/Exception/ResetPasswordExceptionTest.php
rename to tests/Unit/Exception/ResetPasswordExceptionTest.php
index 931029ca..d3add228 100644
--- a/tests/UnitTests/Exception/ResetPasswordExceptionTest.php
+++ b/tests/Unit/Exception/ResetPasswordExceptionTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Exception;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Exception;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Exception\ExpiredResetPasswordTokenException;
diff --git a/tests/UnitTests/Exception/TooManyPasswordRequestsExceptionTest.php b/tests/Unit/Exception/TooManyPasswordRequestsExceptionTest.php
similarity index 92%
rename from tests/UnitTests/Exception/TooManyPasswordRequestsExceptionTest.php
rename to tests/Unit/Exception/TooManyPasswordRequestsExceptionTest.php
index bf3810ff..65bbd451 100644
--- a/tests/UnitTests/Exception/TooManyPasswordRequestsExceptionTest.php
+++ b/tests/Unit/Exception/TooManyPasswordRequestsExceptionTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Exception;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Exception;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Exception\TooManyPasswordRequestsException;
diff --git a/tests/UnitTests/Generator/ResetPasswordRandomGeneratorTest.php b/tests/Unit/Generator/ResetPasswordRandomGeneratorTest.php
similarity index 93%
rename from tests/UnitTests/Generator/ResetPasswordRandomGeneratorTest.php
rename to tests/Unit/Generator/ResetPasswordRandomGeneratorTest.php
index 95bc2ae5..7c3d281b 100644
--- a/tests/UnitTests/Generator/ResetPasswordRandomGeneratorTest.php
+++ b/tests/Unit/Generator/ResetPasswordRandomGeneratorTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Generator;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Generator;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Generator\ResetPasswordRandomGenerator;
diff --git a/tests/UnitTests/Generator/ResetPasswordTokenGeneratorTest.php b/tests/Unit/Generator/ResetPasswordTokenGeneratorTest.php
similarity index 97%
rename from tests/UnitTests/Generator/ResetPasswordTokenGeneratorTest.php
rename to tests/Unit/Generator/ResetPasswordTokenGeneratorTest.php
index 4d035299..462d4838 100644
--- a/tests/UnitTests/Generator/ResetPasswordTokenGeneratorTest.php
+++ b/tests/Unit/Generator/ResetPasswordTokenGeneratorTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Generator;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Generator;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/UnitTests/Model/ResetPasswordRequestTraitTest.php b/tests/Unit/Model/ResetPasswordRequestTraitTest.php
similarity index 97%
rename from tests/UnitTests/Model/ResetPasswordRequestTraitTest.php
rename to tests/Unit/Model/ResetPasswordRequestTraitTest.php
index b55ad00d..4f9c31f0 100644
--- a/tests/UnitTests/Model/ResetPasswordRequestTraitTest.php
+++ b/tests/Unit/Model/ResetPasswordRequestTraitTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Model;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Model;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
diff --git a/tests/UnitTests/Model/ResetPasswordTokenComponentsTest.php b/tests/Unit/Model/ResetPasswordTokenComponentsTest.php
similarity index 92%
rename from tests/UnitTests/Model/ResetPasswordTokenComponentsTest.php
rename to tests/Unit/Model/ResetPasswordTokenComponentsTest.php
index 6c3bb492..f6660be2 100644
--- a/tests/UnitTests/Model/ResetPasswordTokenComponentsTest.php
+++ b/tests/Unit/Model/ResetPasswordTokenComponentsTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Model;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Model;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordTokenComponents;
diff --git a/tests/UnitTests/Model/ResetPasswordTokenTest.php b/tests/Unit/Model/ResetPasswordTokenTest.php
similarity index 96%
rename from tests/UnitTests/Model/ResetPasswordTokenTest.php
rename to tests/Unit/Model/ResetPasswordTokenTest.php
index 754fddfc..808dae02 100644
--- a/tests/UnitTests/Model/ResetPasswordTokenTest.php
+++ b/tests/Unit/Model/ResetPasswordTokenTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Model;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Model;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordToken;
diff --git a/tests/UnitTests/Persistence/FakeResetPasswordInternalRepositoryTest.php b/tests/Unit/Persistence/FakeResetPasswordInternalRepositoryTest.php
similarity index 95%
rename from tests/UnitTests/Persistence/FakeResetPasswordInternalRepositoryTest.php
rename to tests/Unit/Persistence/FakeResetPasswordInternalRepositoryTest.php
index 0246202f..61b04d28 100644
--- a/tests/UnitTests/Persistence/FakeResetPasswordInternalRepositoryTest.php
+++ b/tests/Unit/Persistence/FakeResetPasswordInternalRepositoryTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Persistence;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Persistence;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Exception\FakeRepositoryException;
diff --git a/tests/UnitTests/Persistence/ResetPasswordRequestRepositoryTraitTest.php b/tests/Unit/Persistence/ResetPasswordRequestRepositoryTraitTest.php
similarity index 94%
rename from tests/UnitTests/Persistence/ResetPasswordRequestRepositoryTraitTest.php
rename to tests/Unit/Persistence/ResetPasswordRequestRepositoryTraitTest.php
index 347ea792..ae2370fd 100644
--- a/tests/UnitTests/Persistence/ResetPasswordRequestRepositoryTraitTest.php
+++ b/tests/Unit/Persistence/ResetPasswordRequestRepositoryTraitTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Persistence;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Persistence;
 
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
diff --git a/tests/UnitTests/ResetPasswordHelperTest.php b/tests/Unit/ResetPasswordHelperTest.php
similarity index 99%
rename from tests/UnitTests/ResetPasswordHelperTest.php
rename to tests/Unit/ResetPasswordHelperTest.php
index 045cc53c..83b991ee 100644
--- a/tests/UnitTests/ResetPasswordHelperTest.php
+++ b/tests/Unit/ResetPasswordHelperTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/UnitTests/Util/ResetPasswordCleanerTest.php b/tests/Unit/Util/ResetPasswordCleanerTest.php
similarity index 96%
rename from tests/UnitTests/Util/ResetPasswordCleanerTest.php
rename to tests/Unit/Util/ResetPasswordCleanerTest.php
index 02f0a14c..52875058 100644
--- a/tests/UnitTests/Util/ResetPasswordCleanerTest.php
+++ b/tests/Unit/Util/ResetPasswordCleanerTest.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SymfonyCasts\Bundle\ResetPassword\Tests\UnitTests\Util;
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Unit\Util;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;