diff --git a/.gitignore b/.gitignore
index 6b80c2d..3b94c48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,5 @@ phpunit.xml
 vendor/
 build/
 composer.lock
-.phpunit.result.cache
 phpcs.xml
 .phpcs-cache
diff --git a/composer.json b/composer.json
index 031276d..9b2a3e8 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "phpmyadmin/coding-standard": "^3.0.0",
         "phpmyadmin/motranslator": "^5.2",
         "phpstan/phpstan": "^1.9.4",
-        "phpunit/phpunit": "^7 || ^8 || ^9"
+        "phpunit/phpunit": "^8.5 || ^9.6"
     },
     "scripts": {
         "phpstan": "./vendor/bin/phpstan analyse",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 614234b..1f54f8d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
->
+         cacheResultFile="build/.phpunit.cache/test-results"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         colors="true"
+         verbose="true">
     <testsuites>
-        <testsuite name="Twig Extensions Test Suite">
-            <directory>./test/</directory>
+        <testsuite name="default">
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 
@@ -21,8 +19,8 @@
     </logging>
 
     <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>