diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index f4d2625406..f11cd12103 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: composer install --dev --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
+        run: composer install --dev --prefer-dist --no-progress --no-suggest
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index ab1482444c..0014afdcaf 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -24,20 +24,30 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        php-version: ['7.2', '8.4']
+        php-version: ['7.2']
+        composer-options: ['']
         include:
           - php-version: 7.3
             os: ubuntu-latest
+            composer-options: ''
           - php-version: 7.4
             os: ubuntu-latest
+            composer-options: ''
           - php-version: 8.0
             os: ubuntu-latest
+            composer-options: ''
           - php-version: 8.1
             os: ubuntu-latest
+            composer-options: ''
           - php-version: 8.2
             os: ubuntu-latest
+            composer-options: ''
           - php-version: 8.3
             os: ubuntu-latest
+            composer-options: ''
+          - php-version: 8.4
+            os: ubuntu-latest
+            composer-options: '--ignore-platform-reqs'
     steps:
       - uses: actions/checkout@v4
       - name: Install PHP
@@ -48,8 +58,8 @@ jobs:
           extensions: memcached
       - name: "Composer install"
         run: |
-          composer install --ignore-platform-reqs
-          composer require doctrine/cache ~1.2 --ignore-platform-reqs
+          composer install ${{ matrix.composer-options }}
+          composer require doctrine/cache ~1.2 ${{ matrix.composer-options }}
       - name: PHPUnit / PHP ${{ matrix.php-version }}
         run: |
           php -v