diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 371e033e..3b763a78 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -13,12 +13,13 @@ env:
 
 jobs:
   tests:
-    name: "CI"
+    name: "PHP ${{ matrix.php-version }}, ${{ matrix.dependencies }} dependecies, experimental: ${{ matrix.experimental || false}}"
 
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
+    continue-on-error: ${{ matrix.experimental || false }}
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - "7.2"
@@ -30,22 +31,11 @@ jobs:
           - "8.3"
           - "8.4"
         dependencies: [highest]
-        experimental: [false]
         include:
-          - php-version: "7.2"
-            dependencies: highest
-            experimental: false
           - php-version: "7.2"
             dependencies: lowest
-            experimental: false
-#          - php-version: "8.0"
+#          - php-version: "8.5"
 #            dependencies: highest
-#            experimental: false
-#          - php-version: "8.1"
-#            dependencies: lowest-ignore
-#            experimental: true
-#          - php-version: "8.1"
-#            dependencies: highest-ignore
 #            experimental: true
 
     steps:
@@ -75,7 +65,8 @@ jobs:
       - name: "Validate composer.json"
         run: "composer validate"
 
-      - name: "Run tests"
-        run: "composer test"
-
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: "Run tests"
+        run: "composer test"
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dbd7d7a..a89ad397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Correct PHPStan findings in validator ([#808](https://github.com/jsonrainbow/json-schema/pull/808))
 - Add cs2pr handling for php-cs-fixer; avoid doing composer install ([#814](https://github.com/jsonrainbow/json-schema/pull/814))
+- prepare PHP 8.5 in CI ([#815](https://github.com/jsonrainbow/json-schema/pull/815))
 
 ## [6.3.1] - 2025-03-18
 ### Fixed