diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
index db1c85657c..abc57b3665 100644
--- a/.github/workflows/ci-mssql.yml
+++ b/.github/workflows/ci-mssql.yml
@@ -39,35 +39,30 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  PHP_EXTENSIONS: curl, intl, pdo, pdo_sqlsrv
+  PHP_INI_VALUES: apc.enabled=1,apc.shm_size=32M,apc.enable_cli=1, date.timezone='UTC'
+  PHPUNIT_GROUP: mssql
+  XDEBUG_MODE: coverage
+
 jobs:
   tests:
     name: PHP ${{ matrix.php }}-mssql-${{ matrix.mssql.version }}
 
     env:
-      COVERAGE_DRIVER: ${{ matrix.php == 7.4 && 'xdebug' || 'none' }}
-      PHP_EXTENSIONS: curl, intl, pdo, pdo_sqlsrv
-      PHP_INI_VALUES: apc.enabled=1,apc.shm_size=32M,apc.enable_cli=1, date.timezone='UTC'
-      PHPUNIT_GROUP: mssql
-      XDEBUG_MODE: coverage
+      COVERAGE_DRIVER: xdebug
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
-
+        php: [7.4, 8.5]
         mssql:
           - version: server:2022-latest
             mssql-tool: /opt/mssql-tools18/bin/sqlcmd -C
 
-        include:
-          - php: 8.0
-            mssql:
-              version: server:2019-latest
-              mssql-tool: /opt/mssql-tools18/bin/sqlcmd -C
-
-    services:
+    services: &mssql-service
       mssql:
         image: mcr.microsoft.com/mssql/${{ matrix.mssql.version }}
         env:
@@ -83,7 +78,7 @@ jobs:
           --health-retries=3
           --health-timeout=5s
 
-    steps:
+    steps: &mssql-steps
       - name: Monitor action permissions.
         if: runner.os != 'Windows'
         uses: GitHubSecurityLab/actions-permissions/monitor@v1
@@ -111,3 +106,28 @@ jobs:
           coverage-driver: ${{ env.COVERAGE_DRIVER }}
           coverage-token: ${{ secrets.CODECOV_TOKEN }}
           group: ${{ env.PHPUNIT_GROUP }}
+
+  tests-dev:
+    name: PHP ${{ matrix.php }}-mssql-${{ matrix.mssql.version }}
+
+    env:
+      COVERAGE_DRIVER: none
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.0, 8.1, 8.2, 8.3, 8.4]
+        mssql:
+          - version: server:2022-latest
+            mssql-tool: /opt/mssql-tools18/bin/sqlcmd -C
+        include:
+          - php: 8.0
+            mssql:
+              version: server:2019-latest
+              mssql-tool: /opt/mssql-tools18/bin/sqlcmd -C
+
+    services: *mssql-service
+
+    steps: *mssql-steps