diff --git a/lib/6to5/transformation/transform.js b/lib/6to5/transformation/transform.js
index 31bbf96e45..f7070d5e07 100644
--- a/lib/6to5/transformation/transform.js
+++ b/lib/6to5/transformation/transform.js
@@ -104,7 +104,7 @@ _.each({
   // needs to be after `es6.blockScoping` due to needing `letReferences` set on blocks
   "optional.blockScopingTDZ":         require("./transformers/optional/block-scoping-tdz"),
 
-  "es6.generators":                   require("./transformers/es6/generators"),
+  regenerator:                        require("./transformers/other/regenerator"),
 
   // needs to be after `es6.generators` due to needing `regeneratorRuntime` references
   // needs to be after `es6.forOf` due to needing `Symbol.iterator` references
diff --git a/lib/6to5/transformation/transformers/optional/bluebird-coroutines.js b/lib/6to5/transformation/transformers/optional/bluebird-coroutines.js
index 3be41cdff6..6d6cf5a514 100644
--- a/lib/6to5/transformation/transformers/optional/bluebird-coroutines.js
+++ b/lib/6to5/transformation/transformers/optional/bluebird-coroutines.js
@@ -5,7 +5,7 @@ var t                     = require("../../../types");
 
 exports.manipulateOptions = function (opts) {
   opts.experimental = true;
-  opts.blacklist.push("es6.generators");
+  opts.blacklist.push("regenerator");
 };
 
 exports.optional = true;
diff --git a/lib/6to5/transformation/transformers/es6/generators.js b/lib/6to5/transformation/transformers/other/regenerator.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/generators.js
rename to lib/6to5/transformation/transformers/other/regenerator.js
diff --git a/test/fixtures/transformation/es6-generators/include-regenerator/exec.js b/test/fixtures/transformation/es6-generators/include-regenerator/exec.js
deleted file mode 100644
index cea5770203..0000000000
--- a/test/fixtures/transformation/es6-generators/include-regenerator/exec.js
+++ /dev/null
@@ -1 +0,0 @@
-assert.ok(typeof regeneratorRuntime !== "undefined");
diff --git a/test/fixtures/transformation/es6-generators/include-regenerator/options.json b/test/fixtures/transformation/es6-generators/include-regenerator/options.json
deleted file mode 100644
index b61f12c5b9..0000000000
--- a/test/fixtures/transformation/es6-generators/include-regenerator/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "noCheckAst": true,
-  "includeRegenerator": true
-}