diff --git a/test/_transformation-helper.js b/test/_transformation-helper.js
index 0df5cba322..1683e71b23 100644
--- a/test/_transformation-helper.js
+++ b/test/_transformation-helper.js
@@ -125,12 +125,14 @@ var run = function (task, done) {
 module.exports = function (suiteOpts, taskOpts, dynamicOpts) {
   taskOpts = taskOpts || {};
 
-  require("../register")(taskOpts);
-
   _.each(helper.get(suiteOpts.name, suiteOpts.loc), function (testSuite) {
     if (_.contains(suiteOpts.ignoreSuites, testSuite.title)) return;
 
     suite(suiteOpts.name + "/" + testSuite.title, function () {
+      setup(function () {
+        require("../register")(taskOpts);
+      });
+
       _.each(testSuite.tests, function (task) {
         if (_.contains(suiteOpts.ignoreTasks, task.title) || _.contains(suiteOpts.ignoreTasks, testSuite.title + "/" + task.title)) return;
 
diff --git a/test/regenerator.js b/test/regenerator.js
index 1e9019d52c..a3b0b66610 100644
--- a/test/regenerator.js
+++ b/test/regenerator.js
@@ -1,9 +1,6 @@
 if (!process.env.ALL_6TO5_TESTS) return;
 
-require("../register")({
-  blacklist: ["useStrict"],
-  experimental: true
-});
+require("./_helper").assertVendor("regenerator");
 
 var transform = require("../lib/6to5/transformation/transform");
 var fs        = require("fs");
@@ -11,13 +8,17 @@ var _         = require("lodash");
 
 var regeneratorLoc = __dirname + "/../vendor/regenerator";
 
-if (!fs.existsSync(regeneratorLoc)) {
-  console.error("No vendor/regenerator - run `make bootstrap`");
-  process.exit(1);
-}
+suite("regenerator", function () {
+  setup(function () {
+    require("../register")({
+      blacklist: ["useStrict"],
+      experimental: true
+    });
+  });
 
-_.each(["tests", "async"], function (filename) {
-  var loc = regeneratorLoc + "/test/" + filename + ".es6.js";
-  var code = fs.readFileSync(loc, "utf8");
-  require(loc);
+  _.each(["tests", "async"], function (filename) {
+    var loc = regeneratorLoc + "/test/" + filename + ".es6.js";
+    var code = fs.readFileSync(loc, "utf8");
+    require(loc);
+  });
 });