diff --git a/test/esnext.js b/test/esnext.js
index 7c8d38dd5c..86558a55c6 100644
--- a/test/esnext.js
+++ b/test/esnext.js
@@ -1,3 +1,5 @@
+if (!process.env.ALL_6TO5_TESTS) return;
+
 require("./_transformation-helper")({
   name: "esnext"
 });
diff --git a/test/traceur.js b/test/traceur.js
index 20a395d198..cabd24ff8b 100644
--- a/test/traceur.js
+++ b/test/traceur.js
@@ -1,8 +1,17 @@
-var _ = require("lodash");
+if (!process.env.ALL_6TO5_TESTS) return;
+
+var fs = require("fs");
+var _  = require("lodash");
+
+var traceurLoc = __dirname + "/../vendor/traceur";
+if (!fs.existsSync(traceurLoc)) {
+  console.error("No vendor/traceur - run `git submodule update --init`");
+  process.exit(1);
+}
 
 require("./_transformation-helper")({
   name: "traceur",
-  loc: __dirname + "/../vendor/traceur/test/feature",
+  loc: traceurLoc + "/test/feature",
 
   ignoreSuites: [
     "ObjectMixin",