diff --git a/src/tools/miri/tests/fail/uninit-after-aggregate-assign.rs b/src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.rs
similarity index 100%
rename from src/tools/miri/tests/fail/uninit-after-aggregate-assign.rs
rename to src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.rs
diff --git a/src/tools/miri/tests/fail/uninit-after-aggregate-assign.stderr b/src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.stderr
similarity index 100%
rename from src/tools/miri/tests/fail/uninit-after-aggregate-assign.stderr
rename to src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.stderr
diff --git a/src/tools/miri/tests/fail/uninit_buffer.rs b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.rs
similarity index 93%
rename from src/tools/miri/tests/fail/uninit_buffer.rs
rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.rs
index d622b2fa7d81..8deaa30d50ff 100644
--- a/src/tools/miri/tests/fail/uninit_buffer.rs
+++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.rs
@@ -1,3 +1,4 @@
+//@compile-flags: -Zmiri-disable-validation
 //@error-in-other-file: memory is uninitialized at [0x4..0x10]
 
 #![allow(dropping_copy_types)]
diff --git a/src/tools/miri/tests/fail/uninit_buffer.stderr b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr
similarity index 97%
rename from src/tools/miri/tests/fail/uninit_buffer.stderr
rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr
index 2d04c0f9be2f..cca17a07ec20 100644
--- a/src/tools/miri/tests/fail/uninit_buffer.stderr
+++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr
@@ -10,7 +10,7 @@ LL |         let mut order = unsafe { compare_bytes(left.as_ptr(), right.as_ptr(
    = note: inside `<u8 as core::slice::cmp::SliceOrd>::compare` at RUSTLIB/core/src/slice/cmp.rs:LL:CC
    = note: inside `core::slice::cmp::<impl std::cmp::Ord for [u8]>::cmp` at RUSTLIB/core/src/slice/cmp.rs:LL:CC
 note: inside `main`
-  --> $DIR/uninit_buffer.rs:LL:CC
+  --> $DIR/uninit_alloc_diagnostic.rs:LL:CC
    |
 LL |         drop(slice1.cmp(slice2));
    |              ^^^^^^^^^^^^^^^^^^
diff --git a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.rs b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs
similarity index 96%
rename from src/tools/miri/tests/fail/uninit_buffer_with_provenance.rs
rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs
index ca825901372c..adabff4a2cea 100644
--- a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.rs
+++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs
@@ -1,3 +1,4 @@
+//@compile-flags: -Zmiri-disable-validation
 //@error-in-other-file: memory is uninitialized at [0x4..0x8]
 //@normalize-stderr-test: "a[0-9]+" -> "ALLOC"
 #![feature(strict_provenance)]
diff --git a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.stderr b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr
similarity index 96%
rename from src/tools/miri/tests/fail/uninit_buffer_with_provenance.stderr
rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr
index cd842f0eba53..4dc2d27ead43 100644
--- a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.stderr
+++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr
@@ -10,7 +10,7 @@ LL |         let mut order = unsafe { compare_bytes(left.as_ptr(), right.as_ptr(
    = note: inside `<u8 as core::slice::cmp::SliceOrd>::compare` at RUSTLIB/core/src/slice/cmp.rs:LL:CC
    = note: inside `core::slice::cmp::<impl std::cmp::Ord for [u8]>::cmp` at RUSTLIB/core/src/slice/cmp.rs:LL:CC
 note: inside `main`
-  --> $DIR/uninit_buffer_with_provenance.rs:LL:CC
+  --> $DIR/uninit_alloc_diagnostic_with_provenance.rs:LL:CC
    |
 LL |         drop(slice1.cmp(slice2));
    |              ^^^^^^^^^^^^^^^^^^
diff --git a/src/tools/miri/tests/fail/uninit_byte_read.rs b/src/tools/miri/tests/fail/uninit/uninit_byte_read.rs
similarity index 100%
rename from src/tools/miri/tests/fail/uninit_byte_read.rs
rename to src/tools/miri/tests/fail/uninit/uninit_byte_read.rs
diff --git a/src/tools/miri/tests/fail/uninit_byte_read.stderr b/src/tools/miri/tests/fail/uninit/uninit_byte_read.stderr
similarity index 100%
rename from src/tools/miri/tests/fail/uninit_byte_read.stderr
rename to src/tools/miri/tests/fail/uninit/uninit_byte_read.stderr