diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a00cd33..bab92bb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -58,8 +58,5 @@ jobs:
       - name: Code Quality (by PHPStan)
         run: ./vendor/bin/phpstan analyse
 
-      - name: PHPUnit Unit Tests
+      - name: PHPUnit Tests
         run: ./vendor/bin/phpunit --testdox
-
-      - name: PHPUnit Functional Tests
-        run: ./vendor/bin/phpunit -c Tests/Functional/phpunit.xml.dist --testdox
diff --git a/Tests/Functional/phpunit.xml.dist b/Tests/Functional/phpunit.xml.dist
deleted file mode 100644
index 444932f..0000000
--- a/Tests/Functional/phpunit.xml.dist
+++ /dev/null
@@ -1,32 +0,0 @@
-<phpunit
-    backupGlobals="true"
-    backupStaticAttributes="false"
-    bootstrap="../../vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
-    colors="true"
-    convertErrorsToExceptions="false"
-    convertWarningsToExceptions="false"
-    forceCoversAnnotation="false"
-    processIsolation="false"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false"
-    verbose="false">
-
-    <testsuites>
-        <testsuite name="functional-tests">
-            <directory>.</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../../Classes/Command</directory>
-            <directory suffix=".php">../../Classes/Dashboard</directory>
-        </whitelist>
-    </filter>
-
-    <php>
-        <env name="typo3DatabaseDriver" value="pdo_sqlite"/>
-    </php>
-</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 32764a1..459c34e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,9 +1,10 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
+    bootstrap="vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
     colors="true"
-    convertErrorsToExceptions="false"
-    convertWarningsToExceptions="false"
+    convertErrorsToExceptions="true"
+    convertWarningsToExceptions="true"
     forceCoversAnnotation="false"
     processIsolation="false"
     stopOnError="false"
@@ -13,15 +14,21 @@
     verbose="false">
 
     <testsuites>
-        <testsuite name="unit-tests">
+        <testsuite name="unit">
             <directory>Tests/Unit/</directory>
         </testsuite>
+        <testsuite name="functional">
+            <directory>Tests/Functional/</directory>
+        </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory suffix=".php">Classes/Domain</directory>
-            <directory suffix=".php">Classes/Middleware</directory>
+            <directory suffix=".php">Classes</directory>
         </whitelist>
     </filter>
+
+    <php>
+        <env name="typo3DatabaseDriver" value="pdo_sqlite"/>
+    </php>
 </phpunit>