diff --git a/src/Cargo.lock b/src/Cargo.lock
index 01a19a0cca862dd797f44ff1458ba5f1894b590e..9cd77e71b82dde04638ee53c04353b5ced783024 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -87,7 +87,6 @@ dependencies = [
 name = "compiletest"
 version = "0.0.0"
 dependencies = [
- "build_helper 0.1.0",
  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serialize 0.0.0",
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
index faf0a0eaa81ee5098e7d0ee18be607e4bec58085..227b695635dcec6c67ae13513a0114d09237759a 100644
--- a/src/tools/compiletest/Cargo.toml
+++ b/src/tools/compiletest/Cargo.toml
@@ -8,4 +8,3 @@ build = "build.rs"
 log = "0.3"
 env_logger = { version = "0.3.5", default-features = false }
 serialize = { path = "../../libserialize" }
-build_helper = { path = "../../build_helper" }
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 9e2416fca81aeabdaf7de92140f0f0c592eac192..d729deb8605d257a6b9ab70e1d2d2a7f7eef0363 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate build_helper;
-
 use common::Config;
 use common::{CompileFail, ParseFail, Pretty, RunFail, RunPass, RunPassValgrind};
 use common::{Codegen, DebugInfoLldb, DebugInfoGdb, Rustdoc, CodegenUnits};
@@ -2110,7 +2108,16 @@ fn run_rmake_test(&self) {
         }
         self.create_dir_racy(&tmpdir);
 
-        let mut cmd = Command::new(build_helper::make(&self.config.host));
+        let host = &self.config.host;
+        let make = if host.contains("bitrig") || host.contains("dragonfly") ||
+            host.contains("freebsd") || host.contains("netbsd") ||
+            host.contains("openbsd") {
+            "gmake"
+        } else {
+            "make"
+        };
+
+        let mut cmd = Command::new(make);
         cmd.current_dir(&self.testpaths.file)
            .env("TARGET", &self.config.target)
            .env("PYTHON", &self.config.docck_python)