diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 2edccc4a35..fb593e51ed 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -8,7 +8,7 @@ jobs:
 
         strategy:
             matrix:
-                php-versions: ['7.3', '7.4']
+                php-versions: ['7.3', '7.4', '8.0']
         name: PHP ${{ matrix.php-versions }}
         steps:
             -   uses: actions/checkout@v2
diff --git a/composer.json b/composer.json
index e39cca06ff..758d344754 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     ],
    "license":     "MIT",
     "require-dev": {
-        "phpunit/phpunit": "^5.5"
+        "phpunit/phpunit": "^9.5.6"
     },
     "autoload-dev": {
         "classmap": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f628c0b9fb..304f9c72d2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors                 = "true"
-         bootstrap              = "vendor/autoload.php"
-         backupGlobals          = "false"
-         backupStaticAttributes = "false">
-
-    <testsuites>
-        <testsuite name="Symfony1 test" >
-            <directory>./test/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./lib</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./lib</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Symfony1 test">
+      <directory>./test/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/test/lib/request/sfWebRequestTest.php b/test/lib/request/sfWebRequestTest.php
index 4c0f4d4751..5df2405d35 100644
--- a/test/lib/request/sfWebRequestTest.php
+++ b/test/lib/request/sfWebRequestTest.php
@@ -11,7 +11,7 @@ class sfWebRequestTest extends TestCase
      */
     private $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $event_dispatcher = new sfEventDispatcher();
         $this->request = new sfWebRequest($event_dispatcher);