diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 847307959cb8..edb84829ee21 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -233,6 +233,7 @@ impl Step for Cargo {
         let build = builder.build;
         let compiler = builder.compiler(self.stage, self.host);
 
+        builder.ensure(tool::Cargo { stage: self.stage, target: self.host });
         let mut cargo = builder.cargo(compiler, Mode::Tool, self.host, "test");
         cargo.arg("--manifest-path").arg(build.src.join("src/tools/cargo/Cargo.toml"));
         if !build.fail_fast {
@@ -287,6 +288,7 @@ impl Step for Rls {
         let host = self.host;
         let compiler = builder.compiler(stage, host);
 
+        builder.ensure(tool::Rls { stage: self.stage, target: self.host });
         let mut cargo = builder.cargo(compiler, Mode::Tool, host, "test");
         cargo.arg("--manifest-path").arg(build.src.join("src/tools/rls/Cargo.toml"));
 
@@ -629,10 +631,6 @@ impl Step for Compiletest {
                 sysroot: builder.sysroot(compiler),
                 target: target
             });
-
-            if mode == "debuginfo-gdb" {
-                builder.ensure(RemoteCopyLibs { compiler, target });
-            }
         }
 
         if suite.ends_with("fulldeps") ||
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 9554eb3e2a5b..41dc91f5a2ca 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -16,7 +16,7 @@ use Mode;
 use Compiler;
 use builder::{Step, ShouldRun, Builder};
 use util::{exe, add_lib_path};
-use compile::{self, libtest_stamp, libstd_stamp, librustc_stamp, Rustc};
+use compile::{self, libtest_stamp, libstd_stamp, librustc_stamp};
 use native;
 use channel::GitInfo;
 use cache::Interned;
@@ -347,8 +347,8 @@ impl Step for Cargo {
         });
         // Cargo depends on procedural macros, which requires a full host
         // compiler to be available, so we need to depend on that.
-        builder.ensure(Rustc {
-            compiler: builder.compiler(builder.top_stage, builder.build.build),
+        builder.ensure(compile::Rustc {
+            compiler: builder.compiler(self.stage, builder.build.build),
             target: builder.build.build,
         });
         builder.ensure(ToolBuild {
@@ -394,7 +394,7 @@ impl Step for Rls {
         if path.is_none() && !builder.build.config.extended {
             return;
         }
-        builder.ensure(Cargo {
+        builder.ensure(Rls {
             stage: builder.top_stage,
             target,
         });
@@ -406,8 +406,8 @@ impl Step for Rls {
         });
         // RLS depends on procedural macros, which requires a full host
         // compiler to be available, so we need to depend on that.
-        builder.ensure(Rustc {
-            compiler: builder.compiler(builder.top_stage, builder.build.build),
+        builder.ensure(compile::Rustc {
+            compiler: builder.compiler(self.stage, builder.build.build),
             target: builder.build.build,
         });
         builder.ensure(ToolBuild {