diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4736e907f9..571ac187e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
 
   test:
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix:
         config:
           - os: ubuntu-latest
@@ -172,7 +172,7 @@ jobs:
 
   lint:
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix:
         config:
           - os: ubuntu-latest