diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index d753628718..9a92e4d2d3 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -35,9 +35,16 @@ jobs:
         options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
     strategy:
       matrix:
-        PHPVERSION: [8.1]
-        TEST: [Unit]
+        PHPVERSION: [8.1, 8.2, 8.3, 8.4]
+        TEST: [Unit, E2E]
     steps:
+      - name: Skip this job when not in a merge queue for some combinations
+        run: |
+          if [ "${{ !contains(github.ref, 'gh-readonly-queue') }}" ]; then
+              if [ "${{ matrix.PHPVERSION }}" -ne "8.4" ]; then
+                  exit 0
+              fi
+          fi
       - uses: actions/checkout@v4
       - name: info
         run: |