diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 41715fb274..a531a903db 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -199,7 +199,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: ${{ matrix.php == '8.5' && '8.4' || matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
           coverage: none
 
@@ -229,6 +229,14 @@ jobs:
           composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
           custom-cache-suffix: $(date -u "+%Y-%m")
 
+      - name: "Install PHP again (PHP 8.5)"
+        if: ${{ matrix.php == '8.5' }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
+          coverage: none
+
       - name: 'PHPCS: set the path to PHP'
         run: php "bin/phpcs" --config-set php_path php