diff --git a/Cargo.toml b/Cargo.toml
index a0da1d6b685..caf66bf4f74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,9 @@ doctest = false
 [[bin]]
 name = "rustfmt"
 
+[[bin]]
+name = "cargo-fmt"
+
 [features]
 default = ["cargo-fmt"]
 cargo-fmt = []
diff --git a/tests/system.rs b/tests/system.rs
index 970d9f0e2eb..a6b7536111f 100644
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate rustfmt;
+extern crate rustfmt_nightly as rustfmt;
 extern crate diff;
 extern crate regex;
 extern crate term;