diff --git a/clippy_lints/src/matches/match_bool.rs b/clippy_lints/src/matches/match_bool.rs
index dc3457aa7a46..3e76231b6ef1 100644
--- a/clippy_lints/src/matches/match_bool.rs
+++ b/clippy_lints/src/matches/match_bool.rs
@@ -25,8 +25,9 @@ pub(crate) fn check(cx: &LateContext<'_>, scrutinee: &Expr<'_>, arms: &[Arm<'_>]
             "`match` on a boolean expression",
             move |diag| {
                 let mut app = Applicability::MachineApplicable;
+                let ctxt = expr.span.ctxt();
                 let test_sugg = if let PatKind::Expr(arm_bool) = arms[0].pat.kind {
-                    let test = Sugg::hir_with_applicability(cx, scrutinee, "_", &mut app);
+                    let test = Sugg::hir_with_context(cx, scrutinee, ctxt, "_", &mut app);
                     if let PatExprKind::Lit { lit, .. } = arm_bool.kind {
                         match &lit.node {
                             LitKind::Bool(true) => Some(test),
@@ -36,7 +37,7 @@ pub(crate) fn check(cx: &LateContext<'_>, scrutinee: &Expr<'_>, arms: &[Arm<'_>]
                         .map(|test| {
                             if let Some(guard) = &arms[0]
                                 .guard
-                                .map(|g| Sugg::hir_with_applicability(cx, g, "_", &mut app))
+                                .map(|g| Sugg::hir_with_context(cx, g, ctxt, "_", &mut app))
                             {
                                 test.and(guard)
                             } else {
diff --git a/tests/ui/match_bool.fixed b/tests/ui/match_bool.fixed
index 876ae935afde..3d5d0a0d532c 100644
--- a/tests/ui/match_bool.fixed
+++ b/tests/ui/match_bool.fixed
@@ -74,4 +74,15 @@ fn issue15351() {
     }
 }
 
+fn wrongly_unmangled_macros() {
+    macro_rules! test_expr {
+        ($val:expr) => {
+            ($val + 1) > 0
+        };
+    }
+
+    let x = 5;
+    if test_expr!(x) { 1 } else { 0 };
+}
+
 fn main() {}
diff --git a/tests/ui/match_bool.rs b/tests/ui/match_bool.rs
index a134ad8346e2..4db0aedf3260 100644
--- a/tests/ui/match_bool.rs
+++ b/tests/ui/match_bool.rs
@@ -126,4 +126,19 @@ fn issue15351() {
     }
 }
 
+fn wrongly_unmangled_macros() {
+    macro_rules! test_expr {
+        ($val:expr) => {
+            ($val + 1) > 0
+        };
+    }
+
+    let x = 5;
+    match test_expr!(x) {
+        //~^ match_bool
+        true => 1,
+        false => 0,
+    };
+}
+
 fn main() {}
diff --git a/tests/ui/match_bool.stderr b/tests/ui/match_bool.stderr
index c05742e56339..223acd17aead 100644
--- a/tests/ui/match_bool.stderr
+++ b/tests/ui/match_bool.stderr
@@ -183,5 +183,15 @@ LL +         break 'a;
 LL +     } }
    |
 
-error: aborting due to 13 previous errors
+error: `match` on a boolean expression
+  --> tests/ui/match_bool.rs:137:5
+   |
+LL | /     match test_expr!(x) {
+LL | |
+LL | |         true => 1,
+LL | |         false => 0,
+LL | |     };
+   | |_____^ help: consider using an `if`/`else` expression: `if test_expr!(x) { 1 } else { 0 }`
+
+error: aborting due to 14 previous errors