diff --git a/.mergify.yml b/.mergify.yml
index 4ccecebb183f..f8be4f7096c7 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -21,6 +21,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