diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index e8c40dfdb0a..0e90a762fb4 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -313,6 +313,9 @@ impl Step for Rustfmt {
 
         // Don't build tests dynamically, just a pain to work with
         cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");
+        let dir = testdir(builder, compiler.host);
+        t!(fs::create_dir_all(&dir));
+        cargo.env("RUSTFMT_TEST_DIR", dir);
 
         builder.add_rustc_lib_path(compiler, &mut cargo);
 
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index b6cd17f28ae..0f8029f251b 160000
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit b6cd17f28ae314f2484ff05d3ce57652d51c5e85
+Subproject commit 0f8029f251b569a010cb5cfc5a8bff8bf3c949ac