diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b87f7b4313e..a08c2652eac 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,27 +25,35 @@ jobs:
           - '7.2'
           - '7.3'
           - '7.4'
+        phpunit-version: ['8.5']
         dependencies: [highest]
         allowed_to_fail: [false]
         variant: [normal]
         include:
           - php-version: '7.2'
+            phpunit-version: '8.5'
             dependencies: lowest
             allowed_to_fail: false
             variant: normal
           - php-version: '8.0'
+            phpunit-version: '9.3'
             dependencies: highest
             allowed_to_fail: true
             variant: normal
           - php-version: '7.3'
+            phpunit-version: '8.5'
             dependencies: highest
             allowed_to_fail: false
             variant: 'symfony/symfony:"4.4.*"'
           - php-version: '7.3'
+            phpunit-version: '8.5'
             dependencies: highest
             allowed_to_fail: false
             variant: 'sonata-project/block-bundle:"3.*"'
 
+    env:
+      SYMFONY_PHPUNIT_VERSION: ${{ matrix.phpunit-version }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -75,21 +83,26 @@ jobs:
         if: matrix.variant != 'normal'
         run: composer require ${{ matrix.variant }} --no-update
 
+      - name: Configuration required for PHP 8.0
+        if: matrix.php-version == '8.0'
+        run: composer config platform.php 7.4.99 && composer require phpunit/phpunit --no-update
+
       - name: Install Composer dependencies (lowest)
         if: matrix.dependencies == 'lowest'
         run: composer update --prefer-dist --no-progress --no-interaction --prefer-stable --prefer-lowest
 
       - name: Install Composer dependencies (highest)
-        if: matrix.dependencies == 'highest' && matrix.php-version != '8.0'
+        if: matrix.dependencies == 'highest'
         run: composer update --prefer-dist --no-progress --no-interaction --prefer-stable
 
-      - name: Install Composer dependencies (highest) on PHP 8.0
-        if: matrix.dependencies == 'highest' && matrix.php-version == '8.0'
-        run: composer update --prefer-dist --no-progress --no-interaction --prefer-stable --ignore-platform-req=php
-
       - name: Run Tests
+        if: matrix.php-version != '8.0'
         run: make test
 
+      - name: Run Tests (PHP 8.0)
+        if: matrix.php-version == '8.0'
+        run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
       - name: Send coverage to Codecov
         uses: codecov/codecov-action@v1
         with: