diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04f882f59a..a2272b18d7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -370,11 +370,15 @@ jobs:
   test-ok:
     name: Unit Tests
     runs-on: ubuntu-latest
-    needs: test
+    needs:
+      - test
+    if: always()
     steps:
-      - name: OK
-        # This is just a join target to simplify branch protection setup
-        run: echo OK
+      - name: Build result
+        run: echo ${{ needs.test.result }}
+      - if: ${{ needs.test.result != 'success' }}
+        name: Set status based on matrix build
+        run: exit 1
 
   pacmak-integration-test:
     runs-on: ubuntu-latest
@@ -450,8 +454,12 @@ jobs:
   pacmak-integration-test-ok:
     name: Integration test (jsii-pacmak)
     runs-on: ubuntu-latest
-    needs: pacmak-integration-test
+    needs:
+      - pacmak-integration-test
+    if: always()
     steps:
-      - name: OK
-        # This is just a join target to simplify branch protection setup
-        run: echo OK
+      - name: Build result
+        run: echo ${{ needs.pacmak-integration-test.result }}
+      - if: ${{ needs.pacmak-integration-test.result != 'success' }}
+        name: Set status based on matrix build
+        run: exit 1
diff --git a/.mergify/config.yml b/.mergify/config.yml
index 898a2e4405..a87c95201c 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -3,6 +3,7 @@ queue_rules:
   - name: default-squash
     conditions:
       - status-success=Unit Tests
+      - status-success=Integration test (jsii-pacmak)
     commit_message_template: |-
       {{ title }} (#{{ number }})
 
@@ -12,6 +13,7 @@ queue_rules:
   - name: default-merge
     conditions:
       - status-success=Unit Tests
+      - status-success=Integration test (jsii-pacmak)
     commit_message_template: |-
       {{ title }} (#{{ number }})
 
@@ -46,6 +48,7 @@ pull_request_rules:
       - '#changes-requested-reviews-by=0'
       - status-success=Validate PR Title
       - status-success=Unit Tests
+      - status-success=Integration test (jsii-pacmak)
 
   - name: Synchronize that PR to upstream and merge it (squash)
     actions:
@@ -70,6 +73,7 @@ pull_request_rules:
       - '#changes-requested-reviews-by=0'
       - status-success=Validate PR Title
       - status-success=Unit Tests
+      - status-success=Integration test (jsii-pacmak)
 
   - name: Synchronize that PR to upstream and merge it (no-squash)
     actions:
@@ -94,6 +98,7 @@ pull_request_rules:
       - '#changes-requested-reviews-by=0'
       - status-success=Validate PR Title
       - status-success=Unit Tests
+      - status-success=Integration test (jsii-pacmak)
 
   - name: Clean branch up
     actions: