diff --git a/tests/compile-fail/copy_nonoverlapping.rs b/tests/compile-fail-norustc/copy_nonoverlapping.rs
similarity index 100%
rename from tests/compile-fail/copy_nonoverlapping.rs
rename to tests/compile-fail-norustc/copy_nonoverlapping.rs
diff --git a/tests/compile-fail/copy_null.rs b/tests/compile-fail-norustc/copy_null.rs
similarity index 100%
rename from tests/compile-fail/copy_null.rs
rename to tests/compile-fail-norustc/copy_null.rs
diff --git a/tests/compile-fail/copy_unaligned.rs b/tests/compile-fail-norustc/copy_unaligned.rs
similarity index 100%
rename from tests/compile-fail/copy_unaligned.rs
rename to tests/compile-fail-norustc/copy_unaligned.rs
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 302c080a52e..16311d0749b 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -112,6 +112,13 @@ fn run_pass_miri(opt: bool) {
 
 fn compile_fail_miri(opt: bool) {
     compile_fail("tests/compile-fail", &get_target(), opt);
+    if rustc_test_suite().is_none() {
+        // FIXME: Some tests disabled in rustc test suite because
+        // they run with a debug-assertion libstd which changes the errors.
+        // We should build our own libstd for testing, see
+        // <https://github.com/rust-lang/rust/issues/61833>.
+        compile_fail("tests/compile-fail-norustc", &get_target(), opt);
+    }
 }
 
 fn test_runner(_tests: &[&()]) {