diff --git a/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
index 37d94830db2cf..e76f6d1d2ba0a 100644
--- a/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
@@ -1,4 +1,10 @@
-//@ compile-flags: --test
+//@ revisions: can_unwind
+//@ [can_unwind] compile-flags: --test
+//@ [can_unwind] needs-unwind
+//
+//@ revisions: cannot_unwind
+//@ [cannot_unwind] compile-flags: --test -Zpanic_abort_tests
+//
 //@ run-pass
 
 #![feature(core_intrinsics, generic_assert)]
diff --git a/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
index 86cc7adb90de6..e3850ce446dbe 100644
--- a/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
@@ -1,4 +1,10 @@
-//@ compile-flags: --test
+//@ revisions: can_unwind
+//@ [can_unwind] compile-flags: --test
+//@ [can_unwind] needs-unwind
+//
+//@ revisions: cannot_unwind
+//@ [cannot_unwind] compile-flags: --test -Zpanic_abort_tests
+//
 // ignore-tidy-linelength
 //@ run-pass