diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 58dc8ffc17da2..f2a7d1d00cf28 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -384,9 +384,6 @@ impl Step for Miri {
             );
             cargo.arg("--bin").arg("cargo-miri").arg("--").arg("miri").arg("setup");
 
-            // Tell `cargo miri` not to worry about the sysroot mismatch (we built with
-            // stage1 but run with stage2).
-            cargo.env("MIRI_SKIP_SYSROOT_CHECK", "1");
             // Tell `cargo miri setup` where to find the sources.
             cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
             // Debug things.
diff --git a/src/tools/miri b/src/tools/miri
index 048af409232fc..b1e97df8ee3d6 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit 048af409232fc2d7f8fbe5469080dc8bb702c498
+Subproject commit b1e97df8ee3d67b74b3408579f29b017c4c317ea