diff --git a/.github/workflows/check-fixup-commits.yml b/.github/workflows/check-fixup-commits.yml
index 1e498ed5d7fe..7c25b9e2f211 100644
--- a/.github/workflows/check-fixup-commits.yml
+++ b/.github/workflows/check-fixup-commits.yml
@@ -35,4 +35,4 @@ jobs:
           else
             echo "Fixup commits found in commit history"
             exit 1
-          fi
\ No newline at end of file
+          fi
diff --git a/.mergify.yml b/.mergify.yml
index 007b5f80117a..4ccecebb183f 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -45,6 +45,9 @@ queue_rules:
               - label=proto:expect-breakage
     merge_conditions:
       - base=master
+      - or:
+          - label=bypass:fixup
+          - check-success=check-fixup-commits
       # Require integration tests before merging only
       - or:
           - label=bypass:integration