diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index d5a6146878d8..1c98cdbaf386 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -31,10 +31,10 @@ jobs:
       RUN_FLAKY_TESTS: ${{ contains( github.event.pull_request.labels.*.name, 'run flaky tests') }}
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
 
     strategy:
       matrix:
-        # tests run on 20.04 (Qt 5.12), compile test on 20.10 (Qt 5.14) and 21.04 (Qt 5.15)
         include:
           - distro-version: '20.04'
             qt-version: 5
@@ -46,7 +46,10 @@ jobs:
             with-quick: ON
             with-clazy: OFF
             patch-qt-3d: true
+            with-grass7: OFF
+            with-grass8: OFF
             LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
+            experimental: false
 
           - distro-version: '21.10'
             qt-version: 5
@@ -58,9 +61,12 @@ jobs:
             with-quick: ON
             with-clazy: ON
             patch-qt-3d: false
+            with-grass7: OFF
+            with-grass8: OFF
             LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
+            experimental: false
 
-          - distro-version: '34'
+          - distro-version: '36'
             qt-version: 6
             run-tests: true
             docker-tag-suffix: ''
@@ -70,7 +76,10 @@ jobs:
             with-quick: OFF
             with-clazy: OFF
             patch-qt-3d: false
+            with-grass7: OFF
+            with-grass8: ON
             LD_PRELOAD: ''
+            experimental: false
 
 
       fail-fast: false
@@ -169,6 +178,8 @@ jobs:
                      --env WITH_QUICK=${{ matrix.with-quick }} \
                      --env WITH_3D=${{ matrix.with-3d }} \
                      --env PATCH_QT_3D=${{ matrix.patch-qt-3d }} \
+                     --env WITH_GRASS7=${{ matrix.with-grass7 }} \
+                     --env WITH_GRASS8=${{ matrix.with-grass8 }} \
                      --env LD_PRELOAD=${{ matrix.LD_PRELOAD }} \
                      --env WITH_CLAZY=${{ matrix.with-clazy }} \
                      qgis3-build-deps \
@@ -304,7 +315,7 @@ jobs:
             test-batch: ORACLE
             docker-target: binary-for-oracle
 
-          - distro-version: '34'
+          - distro-version: '36'
             qt-version: 6
             test-batch: ALL_BUT_PROVIDERS
             docker-target: single