diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 46a5065..d733a9c 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -38,7 +38,7 @@ jobs:
         label:
           - 'PHP'
         php:
-          - '8.3'
+          - '8.5'
       fail-fast: false
     with:
       php: ${{ matrix.php }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index c186868..7624cfc 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -39,24 +39,25 @@ jobs:
       # See the following for PHP compatibility of WordPress versions:
       # https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
       matrix:
-        wp:
-          # Three most recent versions of WordPress:
-          - '7.0'
-          - '6.9'
-          - '6.8'
-        php:
-          # Most recent version of PHP supported by all of the above:
-          - '8.4'
-          # Oldest support PHP:
-          - '7.4'
         include:
-          # Latest WordPress on latest PHP:
+          # Latest:
           - wp: '7.0'
             php: '8.5'
-          # Oldest supported WordPress on its newest supported PHP:
+          - wp: '7.0'
+            php: '7.4'
+          # Latest -1:
+          - wp: '6.9'
+            php: '8.5'
+          - wp: '6.9'
+            php: '7.4'
+          # Latest -2:
+          - wp: '6.8'
+            php: '8.4'
+          - wp: '6.8'
+            php: '7.4'
+          # Oldest supported:
           - wp: '6.2'
             php: '8.2'
-          # Oldest supported WordPress on oldest support PHP:
           - wp: '6.2'
             php: '7.4'
       fail-fast: false
diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
index 7bb515f..04c75ef 100644
--- a/.github/workflows/nightly-tests.yml
+++ b/.github/workflows/nightly-tests.yml
@@ -38,7 +38,7 @@ jobs:
         label:
           - 'acceptance'
         php:
-          - '8.3'
+          - '8.5'
           - '7.4'
       fail-fast: false
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@99fbf371962704dbaef452ebe7ea188d5cfb8069 # 2.9.4
@@ -58,7 +58,7 @@ jobs:
         label:
           - 'integration'
         php:
-          - '8.3'
+          - '8.5'
           - '7.4'
       fail-fast: false
     with:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index f7cd142..8edc088 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -35,7 +35,7 @@ jobs:
           - 'PHP'
         php:
           # Newest and oldest supported versions of PHP
-          - '8.4'
+          - '8.5'
           - '7.4'
       fail-fast: false
     with:
diff --git a/readme.txt b/readme.txt
index 3580fde..0768ef9 100644
--- a/readme.txt
+++ b/readme.txt
@@ -87,7 +87,7 @@ User Switching should adhere to Web Content Accessibility Guidelines (WCAG) 2.0
 
 ### Does this plugin work with PHP 8?
 
-Yes, it's actively tested and working up to PHP 8.4.
+Yes, it's actively tested and working up to PHP 8.5.
 
 ### What does "Switch off" mean?