diff --git a/README.md b/README.md
index e21ee98712..2eae254802 100644
--- a/README.md
+++ b/README.md
@@ -282,8 +282,7 @@ The setup for a local rustc works as follows:
 git clone https://github.com/rust-lang/rust/ rustc
 cd rustc
 cp config.toml.example config.toml
-# Now edit `config.toml` and set `debug-assertions = true` and `test-miri = true`.
-# The latter is important to build libstd with the right flags for miri.
+# Now edit `config.toml` and set `debug-assertions = true`.
 # This step can take 30 minutes and more.
 ./x.py build src/rustc
 # If you change something, you can get a faster rebuild by doing
diff --git a/tests/compile-fail-norustc/copy_null.rs b/tests/compile-fail/copy_null.rs
similarity index 100%
rename from tests/compile-fail-norustc/copy_null.rs
rename to tests/compile-fail/copy_null.rs
diff --git a/tests/compile-fail-norustc/copy_nonoverlapping.rs b/tests/compile-fail/copy_overlapping.rs
similarity index 100%
rename from tests/compile-fail-norustc/copy_nonoverlapping.rs
rename to tests/compile-fail/copy_overlapping.rs
diff --git a/tests/compile-fail-norustc/copy_unaligned.rs b/tests/compile-fail/copy_unaligned.rs
similarity index 100%
rename from tests/compile-fail-norustc/copy_unaligned.rs
rename to tests/compile-fail/copy_unaligned.rs
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 9394084ad3..757e8c1a64 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -108,13 +108,6 @@ 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: &[&()]) {