diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c74bb2..9380cd1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,6 +45,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
         dependencies_level:
           - --prefer-lowest
           - ""
@@ -77,7 +78,11 @@ jobs:
           key: "cache-composer-${{ hashFiles('composer.json') }}"
           restore-keys: 'cache-composer-'
       - name: Run composer
+        if: ${{ matrix.php_version != '8.5' }}
         run: composer update ${{ matrix.dependencies_level }} --prefer-dist --no-interaction --no-progress
+      - name: Run composer PHP 8.5 workaround
+        if: ${{ matrix.php_version == '8.5' }}
+        run: composer update ${{ matrix.dependencies_level }} --ignore-platform-reqs --prefer-dist --no-interaction --no-progress
       - name: Check composer.json
         run: composer normalize --dry-run
       - name: Run tests
@@ -87,10 +92,10 @@ jobs:
       - name: Run PHPStan
         run: vendor/bin/phpstan analyse --no-progress
       - name: Run psalm
-        if: ${{ matrix.os != 'windows-latest' }}
+        if: ${{ matrix.os != 'windows-latest' && matrix.php_version != '8.5' }}
         run: vendor/bin/psalm
       - name: Run phan
-        if: ${{ matrix.os != 'windows-latest' }}
+        if: ${{ matrix.os != 'windows-latest' && matrix.php_version != '8.5' }}
         run: vendor/bin/phan
       # AST 1.1 binary for Windows seems to be missing on PECL
       - name: Run phan with polyfill