diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0c00c1a9c9..8965aaa417 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -30,12 +30,28 @@
     <server name="SHELL_VERBOSITY" value="-1"/>
     <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
     <server name="SYMFONY_PHPUNIT_VERSION" value="9.5"/>
+    <!-- <env name="CACHE_DRIVER" value="array"/> -->
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+    <env name="MAIL_DRIVER" value="array"/>
   </php>
   <testsuites>
-    <testsuite name="Project Test Suite">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
+        <testsuite name="Controller">
+            <directory suffix="Test.php">./tests/Controller</directory>
+        </testsuite>
+        <testsuite name="Core">
+            <directory suffix="Test.php">./tests/Core</directory>
+        </testsuite>
+        <testsuite name="Entity">
+            <directory suffix="Test.php">./tests/Entity</directory>
+        </testsuite>
+        <testsuite name="Twig">
+            <directory suffix="Test.php">./tests/Twig</directory>
+        </testsuite>
+        <testsuite name="Util">
+            <directory suffix="Test.php">./tests/Util</directory>
+        </testsuite>
+    </testsuites>
   <listeners>
     <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
   </listeners>