diff --git a/src/tools/miri/tests/pass/both_borrows/2phase.rs b/src/tools/miri/tests/pass/both_borrows/2phase.rs
index c53ae4cbd0ea..7a3962a7c1a4 100644
--- a/src/tools/miri/tests/pass/both_borrows/2phase.rs
+++ b/src/tools/miri/tests/pass/both_borrows/2phase.rs
@@ -1,9 +1,6 @@
 //@revisions: stack tree
 //@[tree]compile-flags: -Zmiri-tree-borrows
 
-// FIXME: this miscompiles with optimizations, see <https://github.com/rust-lang/rust/issues/132898>.
-//@compile-flags: -Zmir-opt-level=0
-
 trait S: Sized {
     fn tpb(&mut self, _s: Self) {}
 }
@@ -34,9 +31,9 @@ fn two_phase3(b: bool) {
     ));
 }
 
-#[allow(unreachable_code)]
 fn two_phase_raw() {
     let x: &mut Vec<i32> = &mut vec![];
+    #[allow(unreachable_code)] // The `push` itself never gets reached.
     x.push({
         // Unfortunately this does not trigger the problem of creating a
         // raw ponter from a pointer that had a two-phase borrow derived from
diff --git a/src/tools/miri/tests/pass/stacked-borrows/coroutine-self-referential.rs b/src/tools/miri/tests/pass/stacked_borrows/coroutine-self-referential.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/coroutine-self-referential.rs
rename to src/tools/miri/tests/pass/stacked_borrows/coroutine-self-referential.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/int-to-ptr.rs b/src/tools/miri/tests/pass/stacked_borrows/int-to-ptr.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/int-to-ptr.rs
rename to src/tools/miri/tests/pass/stacked_borrows/int-to-ptr.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/issue-miri-2389.rs b/src/tools/miri/tests/pass/stacked_borrows/issue-miri-2389.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/issue-miri-2389.rs
rename to src/tools/miri/tests/pass/stacked_borrows/issue-miri-2389.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/issue-miri-2389.stderr b/src/tools/miri/tests/pass/stacked_borrows/issue-miri-2389.stderr
similarity index 89%
rename from src/tools/miri/tests/pass/stacked-borrows/issue-miri-2389.stderr
rename to src/tools/miri/tests/pass/stacked_borrows/issue-miri-2389.stderr
index bcb7a65e90f0..8ca3c6c618ea 100644
--- a/src/tools/miri/tests/pass/stacked-borrows/issue-miri-2389.stderr
+++ b/src/tools/miri/tests/pass/stacked_borrows/issue-miri-2389.stderr
@@ -1,5 +1,5 @@
 warning: integer-to-pointer cast
-  --> tests/pass/stacked-borrows/issue-miri-2389.rs:LL:CC
+  --> tests/pass/stacked_borrows/issue-miri-2389.rs:LL:CC
    |
 LL |         let wildcard = &root0 as *const Cell<i32> as usize as *const Cell<i32>;
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ integer-to-pointer cast
@@ -10,5 +10,5 @@ LL |         let wildcard = &root0 as *const Cell<i32> as usize as *const Cell<i
    = help: you can then set `MIRIFLAGS=-Zmiri-strict-provenance` to ensure you are not relying on `with_exposed_provenance` semantics
    = help: alternatively, `MIRIFLAGS=-Zmiri-permissive-provenance` disables this warning
    = note: BACKTRACE:
-   = note: inside `main` at tests/pass/stacked-borrows/issue-miri-2389.rs:LL:CC
+   = note: inside `main` at tests/pass/stacked_borrows/issue-miri-2389.rs:LL:CC
 
diff --git a/src/tools/miri/tests/pass/stacked-borrows/no_field_retagging.rs b/src/tools/miri/tests/pass/stacked_borrows/no_field_retagging.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/no_field_retagging.rs
rename to src/tools/miri/tests/pass/stacked_borrows/no_field_retagging.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/non_scalar_field_retagging.rs b/src/tools/miri/tests/pass/stacked_borrows/non_scalar_field_retagging.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/non_scalar_field_retagging.rs
rename to src/tools/miri/tests/pass/stacked_borrows/non_scalar_field_retagging.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/stack-printing.rs b/src/tools/miri/tests/pass/stacked_borrows/stack-printing.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/stack-printing.rs
rename to src/tools/miri/tests/pass/stacked_borrows/stack-printing.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout b/src/tools/miri/tests/pass/stacked_borrows/stack-printing.stdout
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout
rename to src/tools/miri/tests/pass/stacked_borrows/stack-printing.stdout
diff --git a/src/tools/miri/tests/pass/stacked-borrows/stacked-borrows.rs b/src/tools/miri/tests/pass/stacked_borrows/stacked-borrows.rs
similarity index 90%
rename from src/tools/miri/tests/pass/stacked-borrows/stacked-borrows.rs
rename to src/tools/miri/tests/pass/stacked_borrows/stacked-borrows.rs
index 3620f1536fb9..e68a5d8ffe74 100644
--- a/src/tools/miri/tests/pass/stacked-borrows/stacked-borrows.rs
+++ b/src/tools/miri/tests/pass/stacked_borrows/stacked-borrows.rs
@@ -1,3 +1,6 @@
+// FIXME: this miscompiles with optimizations, see <https://github.com/rust-lang/rust/issues/132898>.
+//@compile-flags: -Zmir-opt-level=0
+
 // Test various stacked-borrows-specific things
 // (i.e., these do not work the same under TB).
 fn main() {
diff --git a/src/tools/miri/tests/pass/stacked-borrows/unknown-bottom-gc.rs b/src/tools/miri/tests/pass/stacked_borrows/unknown-bottom-gc.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/unknown-bottom-gc.rs
rename to src/tools/miri/tests/pass/stacked_borrows/unknown-bottom-gc.rs
diff --git a/src/tools/miri/tests/pass/stacked-borrows/zst-field-retagging-terminates.rs b/src/tools/miri/tests/pass/stacked_borrows/zst-field-retagging-terminates.rs
similarity index 100%
rename from src/tools/miri/tests/pass/stacked-borrows/zst-field-retagging-terminates.rs
rename to src/tools/miri/tests/pass/stacked_borrows/zst-field-retagging-terminates.rs