diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 05af7210b1c..2ead5d0a37f 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -393,7 +393,7 @@ impl Step for Miri {
             cargo.arg("--").arg("miri").arg("setup");
 
             // Tell `cargo miri setup` where to find the sources.
-            cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
+            cargo.env("XARGO_RUST_SRC", builder.src.join("library"));
             // Tell it where to find Miri.
             cargo.env("MIRI", &miri);
             // Debug things.
diff --git a/src/tools/miri b/src/tools/miri
index 515287f114b..55bdb317465 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit 515287f114b546a72d4a1fe8ffe1dbc20dedf13d
+Subproject commit 55bdb3174653039f47362742f8dc941bfc086e8f