diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 7d30cc08a4..d37f740bb4 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -29,19 +29,18 @@ jobs:
       # - coverage: Whether to run the tests with code coverage.
       # - experimental: Whether the build is "allowed to fail".
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
         wp: ['latest']
         coverage: [none]
         experimental: [false]
         include:
-          - php: '8.3'
+          - php: '8.4'
             coverage: pcov
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
             experimental: false
-          - php: '8.4'
+          - php: '8.5'
             wp: 'trunk'
-            coverage: none
             experimental: true
       fail-fast: false
     continue-on-error: ${{ matrix.experimental }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 653aa83043..5217c9f954 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -30,17 +30,16 @@ jobs:
       # - coverage: Whether to run the tests with code coverage.
       # - experimental: Whether the build is "allowed to fail".
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
         coverage: [none]
         experimental: [false]
         include:
-          - php: '8.3'
+          - php: '8.4'
             coverage: pcov
             extensions: pcov
             ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
             experimental: false
-          - php: '8.4'
-            coverage: none
+          - php: '8.5'
             experimental: true
       fail-fast: false
     continue-on-error: ${{ matrix.experimental }}