diff --git a/src/Cargo.lock b/src/Cargo.lock
index d762b96d05cf7..7b64633802d26 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1460,7 +1460,7 @@ dependencies = [
  "rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustfmt-nightly 0.2.9",
+ "rustfmt-nightly 0.2.13",
  "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1944,7 +1944,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "0.2.9"
+version = "0.2.13"
 dependencies = [
  "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index 9754bcb535fa8..cf0d494dda744 160000
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 9754bcb535fa84c000fe78cb91b30c3f661fc849
+Subproject commit cf0d494dda7447bacaab743a70c47e28bea55c6f
diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml
index 9dd420c14586d..f1684f4c5acbe 100644
--- a/src/tools/toolstate.toml
+++ b/src/tools/toolstate.toml
@@ -29,7 +29,7 @@ miri = "Broken"
 clippy = "Broken"
 
 # ping @nrc
-rls = "Broken"
+rls = "Testing"
 
 # ping @nrc
-rustfmt = "Broken"
+rustfmt = "Testing"