diff --git a/.github/workflows/browser_tests.yml b/.github/workflows/browser_tests.yml
index 97431e181..caadf599d 100644
--- a/.github/workflows/browser_tests.yml
+++ b/.github/workflows/browser_tests.yml
@@ -68,18 +68,8 @@ jobs:
         run: sudo apt-get -y update && sudo apt-get -y install --no-install-recommends aspell aspell-en aspell-de
 
       - name: Execute tests
-        if: ${{ matrix.php != '8.5' }}
         run: .ci/run_browser_tests.sh
 
-      # Pass in a composer arg to make composer not complain about PHP version constrains with v8.5-rc until all
-      # dependency packages have released a version that supports v8.5.
-      - name: Execute tests
-        if: ${{ matrix.php == '8.5' }}
-        env:
-          COMPOSER_ARGS: "--ignore-platform-reqs"
-        run: .ci/run_browser_tests.sh
-
-
       - name: Upload screenshots as artifacts
         # Upload screenshot if the test suite failed.
         if: failure()
diff --git a/.github/workflows/message_rendering.yml b/.github/workflows/message_rendering.yml
index 1fdfbba71..c18c7b08a 100644
--- a/.github/workflows/message_rendering.yml
+++ b/.github/workflows/message_rendering.yml
@@ -28,14 +28,6 @@ jobs:
       # services are started before the repo is cloned). And instead of
       # re-building what our compose-file contains we can just use it.
       - name: Run tests via docker compose
-        if: ${{ matrix.php != '8.5' }}
-        run: docker compose -f .ci/compose.yaml run test_message_rendering
-
-      - name: Run tests via docker compose
-        if: ${{ matrix.php == '8.5' }}
-        env:
-          ROUNDCUBEMAIL_IMAGE_MESSAGE_RENDERING: ghcr.io/roundcube/roundcubemail:php8.5-rc
-          COMPOSER_ARGS: '--ignore-platform-reqs'
         run: docker compose -f .ci/compose.yaml run test_message_rendering
 
       - name: Upload artifacts
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 33742a539..144451123 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,15 +38,6 @@ jobs:
         run: sudo apt-get -y update && sudo apt-get -y install --no-install-recommends aspell aspell-en aspell-de hunspell-en-us
 
       - name: Execute tests
-        if: ${{ matrix.php != '8.5' }}
-        run: .ci/run_tests.sh
-
-      # Pass in a composer arg to make composer not complain about PHP version constrains with v8.5-rc until all
-      # dependency packages have released a version that supports v8.5.
-      - name: Execute tests
-        if: ${{ matrix.php == '8.5' }}
-        env:
-          COMPOSER_ARGS: "--ignore-platform-reqs"
         run: .ci/run_tests.sh
 
       - name: Upload artifacts
@@ -80,15 +71,6 @@ jobs:
           coverage: none
 
       - name: Execute tests
-        if: ${{ matrix.php != '8.5' }}
-        run: bash -ex .ci/run_tests.sh
-
-      # Pass in a composer arg to make composer not complain about PHP version constrains with v8.5-rc until all
-      # dependency packages have released a version that supports v8.5.
-      - name: Execute tests
-        if: ${{ matrix.php == '8.5' }}
-        env:
-          COMPOSER_ARGS: "--ignore-platform-reqs"
         run: bash -ex .ci/run_tests.sh
 
       - name: Upload artifacts