diff --git a/lib/6to5/transformation/modules/_strict.js b/lib/6to5/transformation/modules/_strict.js
deleted file mode 100644
index 160f30b547..0000000000
--- a/lib/6to5/transformation/modules/_strict.js
+++ /dev/null
@@ -1,14 +0,0 @@
-"use strict";
-
-var util = require("../../util");
-
-module.exports = function (Parent) {
-  var Constructor = function () {
-    this.noInteropExport = true;
-    Parent.apply(this, arguments);
-  };
-
-  util.inherits(Constructor, Parent);
-
-  return Constructor;
-};
diff --git a/lib/6to5/transformation/modules/amd.js b/lib/6to5/transformation/modules/amd.js
index 2de2e8c798..feb1cee120 100644
--- a/lib/6to5/transformation/modules/amd.js
+++ b/lib/6to5/transformation/modules/amd.js
@@ -107,7 +107,7 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
 };
 
 AMDFormatter.prototype.exportDeclaration = function (node) {
-  if (node.default && !this.noInteropExport) {
+  if (node.default) {
     this.passModuleArg = true;
   }
 
diff --git a/lib/6to5/transformation/modules/common-strict.js b/lib/6to5/transformation/modules/common-strict.js
deleted file mode 100644
index bb7b5c944c..0000000000
--- a/lib/6to5/transformation/modules/common-strict.js
+++ /dev/null
@@ -1,3 +0,0 @@
-"use strict";
-
-module.exports = require("./_strict")(require("./common"));
diff --git a/lib/6to5/transformation/modules/common.js b/lib/6to5/transformation/modules/common.js
index ac495947ec..ec74d66cb1 100644
--- a/lib/6to5/transformation/modules/common.js
+++ b/lib/6to5/transformation/modules/common.js
@@ -67,7 +67,7 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
 };
 
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
-  if (node.default && !this.noInteropRequire && !this.noInteropExport) {
+  if (node.default && !this.noInteropRequire) {
     var declar = node.declaration;
     var assign;
 
diff --git a/lib/6to5/transformation/modules/umd-strict.js b/lib/6to5/transformation/modules/umd-strict.js
deleted file mode 100644
index 6104513e81..0000000000
--- a/lib/6to5/transformation/modules/umd-strict.js
+++ /dev/null
@@ -1,3 +0,0 @@
-"use strict";
-
-module.exports = require("./_strict")(require("./umd"));
diff --git a/lib/6to5/transformation/transform.js b/lib/6to5/transformation/transform.js
index e9153224e8..123f52b6fb 100644
--- a/lib/6to5/transformation/transform.js
+++ b/lib/6to5/transformation/transform.js
@@ -38,14 +38,11 @@ transform._ensureTransformerNames = function (type, keys) {
 transform.transformers = {};
 
 transform.moduleFormatters = {
-  commonStrict: require("./modules/common-strict"),
-  umdStrict:    require("./modules/umd-strict"),
-  amdStrict:    require("./modules/amd-strict"),
-  common:       require("./modules/common"),
-  system:       require("./modules/system"),
-  ignore:       require("./modules/ignore"),
-  amd:          require("./modules/amd"),
-  umd:          require("./modules/umd")
+  common: require("./modules/common"),
+  system: require("./modules/system"),
+  ignore: require("./modules/ignore"),
+  amd:    require("./modules/amd"),
+  umd:    require("./modules/umd")
 };
 
 _.each({
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-default/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-default/actual.js
deleted file mode 100644
index 62923e5c15..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-default/actual.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default 42;
-export default {};
-export default [];
-export default foo;
-export default function () {}
-export default class {}
-export default function foo () {}
-export default class Foo {}
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-default/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-default/expected.js
deleted file mode 100644
index 3ba52475d7..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-default/expected.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["exports"], function (exports) {
-  "use strict";
-
-  exports["default"] = foo;
-  exports["default"] = 42;
-  exports["default"] = {};
-  exports["default"] = [];
-  exports["default"] = foo;
-  exports["default"] = function () {};
-
-  exports["default"] = function () {};
-
-  function foo() {}
-  var Foo = function Foo() {};
-
-  exports["default"] = Foo;
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-default/untitled b/test/fixtures/transformation/es6-modules-amd-strict/exports-default/untitled
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-from/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-from/actual.js
deleted file mode 100644
index 60857f6542..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-from/actual.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "foo";
-export {foo} from "foo";
-export {foo, bar} from "foo";
-export {foo as bar} from "foo";
-export {foo as default} from "foo";
-export {foo as default, bar} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-from/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-from/expected.js
deleted file mode 100644
index 374e2f4043..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-from/expected.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(["exports", "foo"], function (exports, _foo) {
-  "use strict";
-
-  var _interopRequireWildcard = function (obj) {
-    return obj && obj.constructor === Object ? obj : {
-      "default": obj
-    };
-  };
-
-  var _defaults = function (obj, defaults) {
-    for (var key in defaults) {
-      if (obj[key] === undefined) {
-        obj[key] = defaults[key];
-      }
-    }
-
-    return obj;
-  };
-
-  _defaults(exports, _interopRequireWildcard(_foo));
-
-  exports.foo = _foo.foo;
-  exports.foo = _foo.foo;
-  exports.bar = _foo.bar;
-  exports.bar = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports.bar = _foo.bar;
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-named/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-named/actual.js
deleted file mode 100644
index 8515ace759..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-named/actual.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export {foo};
-export {foo, bar};
-export {foo as bar};
-export {foo as default};
-export {foo as default, bar};
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-named/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-named/expected.js
deleted file mode 100644
index 76c505a7ce..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-named/expected.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(["exports"], function (exports) {
-  "use strict";
-
-  exports.foo = foo;
-  exports.foo = foo;
-  exports.bar = bar;
-  exports.bar = foo;
-  exports["default"] = foo;
-  exports["default"] = foo;
-  exports.bar = bar;
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-variable/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-variable/actual.js
deleted file mode 100644
index c9cd5af09c..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-variable/actual.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export var foo = 1;
-export var foo = 1, bar = 2;
-export var foo2 = function () {};
-export var foo3;
-export let foo4 = 2;
-export let foo5;
-export const foo6 = 3;
-export function foo7 () {}
-export class foo8 {}
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/exports-variable/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/exports-variable/expected.js
deleted file mode 100644
index d01bae5920..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/exports-variable/expected.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["exports"], function (exports) {
-  "use strict";
-
-  exports.foo7 = foo7;
-  var foo = exports.foo = 1;
-  var foo = exports.foo = 1;
-  var bar = exports.bar = 2;
-  var foo2 = exports.foo2 = function () {};
-  var foo3 = exports.foo3 = undefined;
-  var foo4 = exports.foo4 = 2;
-  var foo5 = exports.foo5 = undefined;
-  var foo6 = exports.foo6 = 3;
-  function foo7() {}
-  var foo8 = function foo8() {};
-
-  exports.foo8 = foo8;
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/actual.js
deleted file mode 100644
index 3c40b7d1c1..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/actual.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { isEven } from "./evens";
-
-export function nextOdd(n) {
-  return isEven(n) ? n + 1 : n + 2;
-}
-
-export var isOdd = (function (isEven) {
-  return function (n) {
-    return !isEven(n);
-  };
-})(isEven);
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/expected.js
deleted file mode 100644
index 5f8f8e9886..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/expected.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["exports", "./evens"], function (exports, _evens) {
-  "use strict";
-
-  exports.nextOdd = nextOdd;
-  var isEven = _evens.isEven;
-  function nextOdd(n) {
-    return isEven(n) ? n + 1 : n + 2;
-  }
-
-  var isOdd = exports.isOdd = (function (isEven) {
-    return function (n) {
-      return !isEven(n);
-    };
-  })(isEven);
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-default/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-default/actual.js
deleted file mode 100644
index 7a085cb1e3..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-default/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import foo from "foo";
-import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-default/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-default/expected.js
deleted file mode 100644
index bcc4b497c9..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-default/expected.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(["exports", "foo"], function (exports, _foo) {
-  "use strict";
-
-  var _interopRequire = function (obj) {
-    return obj && (obj["default"] || obj);
-  };
-
-  var foo = _interopRequire(_foo);
-
-  var foo2 = _interopRequire(_foo);
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-glob/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-glob/actual.js
deleted file mode 100644
index e55c077500..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-glob/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-import * as foo from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-glob/expected.js
deleted file mode 100644
index cc03946787..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-glob/expected.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(["exports", "foo"], function (exports, _foo) {
-  "use strict";
-
-  var foo = _foo;
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/actual.js
deleted file mode 100644
index ef78c95b1c..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-import foo, {baz as xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/expected.js
deleted file mode 100644
index 8acd23bf34..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/expected.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(["exports", "foo"], function (exports, _foo) {
-  "use strict";
-
-  var _interopRequire = function (obj) {
-    return obj && (obj["default"] || obj);
-  };
-
-  var foo = _interopRequire(_foo);
-
-  var xyz = _foo.baz;
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-named/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-named/actual.js
deleted file mode 100644
index 6d50813b6f..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-named/actual.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import {bar} from "foo";
-import {bar2, baz} from "foo";
-import {bar as baz2} from "foo";
-import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports-named/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/imports-named/expected.js
deleted file mode 100644
index f1cbf26ee3..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports-named/expected.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(["exports", "foo"], function (exports, _foo) {
-  "use strict";
-
-  var bar = _foo.bar;
-  var bar2 = _foo.bar2;
-  var baz = _foo.baz;
-  var baz2 = _foo.bar;
-  var baz3 = _foo.bar;
-  var xyz = _foo.xyz;
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/imports/actual.js
deleted file mode 100644
index 222b6885ac..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "foo";
-import "foo-bar";
-import "./directory/foo-bar";
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/imports/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/imports/expected.js
deleted file mode 100644
index 84e1e6dcc7..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/imports/expected.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
-  "use strict";
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/module-name/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/module-name/actual.js
deleted file mode 100644
index f3b473756e..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/module-name/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-foobar();
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/module-name/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/module-name/expected.js
deleted file mode 100644
index ee25e68fdf..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/module-name/expected.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define("es6-modules-amd-strict/module-name/expected", ["exports"], function (exports) {
-  "use strict";
-
-  foobar();
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/module-name/options.json b/test/fixtures/transformation/es6-modules-amd-strict/module-name/options.json
deleted file mode 100644
index a2868455b4..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/module-name/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "amdModuleIds": true
-}
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/options.json b/test/fixtures/transformation/es6-modules-amd-strict/options.json
deleted file mode 100644
index a1b394048a..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "modules": "amdStrict"
-}
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/overview/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/overview/actual.js
deleted file mode 100644
index 1623f8b61e..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/overview/actual.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import "foo";
-import "foo-bar";
-import "./directory/foo-bar";
-import foo from "foo";
-import * as foo2 from "foo";
-import {bar} from "foo";
-import {foo as bar2} from "foo";
-
-export {test};
-export var test2 = 5;
-
-export default test;
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/overview/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/overview/expected.js
deleted file mode 100644
index fdcfb94ff7..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/overview/expected.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
-  "use strict";
-
-  var _interopRequire = function (obj) {
-    return obj && (obj["default"] || obj);
-  };
-
-  var foo = _interopRequire(_foo);
-
-  var foo2 = _foo;
-  var bar = _foo.bar;
-  var bar2 = _foo.foo;
-  exports.test = test;
-  var test2 = exports.test2 = 5;
-
-  exports["default"] = test;
-});
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/remap/actual.js b/test/fixtures/transformation/es6-modules-amd-strict/remap/actual.js
deleted file mode 100644
index 79c234d8ae..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/remap/actual.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export var test = 2;
-test = 5;
-test++;
-
-(function () {
-  var test = 2;
-  test = 3;
-  test++;
-})();
diff --git a/test/fixtures/transformation/es6-modules-amd-strict/remap/expected.js b/test/fixtures/transformation/es6-modules-amd-strict/remap/expected.js
deleted file mode 100644
index 1edd3204c1..0000000000
--- a/test/fixtures/transformation/es6-modules-amd-strict/remap/expected.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define(["exports"], function (exports) {
-  "use strict";
-
-  var test = exports.test = 2;
-  test = exports.test = 5;
-  test = exports.test += 1;
-
-  (function () {
-    var test = 2;
-    test = 3;
-    test++;
-  })();
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/actual.js
deleted file mode 100644
index 1d832634ed..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo } from "foo";
-var foo;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/actual.js
deleted file mode 100644
index 1857a40a8c..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo } from "foo";
-foo.bar = 1;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/actual.js
deleted file mode 100644
index f4d2ebe99a..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as foo from "foo";
-foo = 1;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/actual.js
deleted file mode 100644
index 41d4752b52..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as foo from "foo";
-var foo;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/actual.js
deleted file mode 100644
index f0c5ef2439..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo as bar } from "foo";
-var bar;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/actual.js
deleted file mode 100644
index b3ce137015..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo as bar } from "foo";
-bar = 1;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/actual.js
deleted file mode 100644
index f2257a7a53..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo } from "foo";
-import { foo } from "bar";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/actual.js
deleted file mode 100644
index c58a0e64c5..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo as bar } from "foo";
-import { foo as bar } from "bar";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/actual.js b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/actual.js
deleted file mode 100644
index e1b913ccf6..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { foo } from "foo";
-foo = 1;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/options.json b/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/options.json
deleted file mode 100644
index a9357a58d2..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Illegal assignment of module import"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/actual.js b/test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/actual.js
deleted file mode 100644
index 44bb8e1880..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default new Cachier()
-
-export function Cachier(databaseName) {}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/expected.js b/test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/expected.js
deleted file mode 100644
index 88f1bc50a3..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/expected.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-exports.Cachier = Cachier;
-exports["default"] = new Cachier();
-function Cachier(databaseName) {}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-default/actual.js b/test/fixtures/transformation/es6-modules-common-strict/exports-default/actual.js
deleted file mode 100644
index 62923e5c15..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-default/actual.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default 42;
-export default {};
-export default [];
-export default foo;
-export default function () {}
-export default class {}
-export default function foo () {}
-export default class Foo {}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-default/expected.js b/test/fixtures/transformation/es6-modules-common-strict/exports-default/expected.js
deleted file mode 100644
index 7c23f593d5..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-default/expected.js
+++ /dev/null
@@ -1,15 +0,0 @@
-"use strict";
-
-exports["default"] = foo;
-exports["default"] = 42;
-exports["default"] = {};
-exports["default"] = [];
-exports["default"] = foo;
-exports["default"] = function () {};
-
-exports["default"] = function () {};
-
-function foo() {}
-var Foo = function Foo() {};
-
-exports["default"] = Foo;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-from/actual.js b/test/fixtures/transformation/es6-modules-common-strict/exports-from/actual.js
deleted file mode 100644
index 60857f6542..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-from/actual.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "foo";
-export {foo} from "foo";
-export {foo, bar} from "foo";
-export {foo as bar} from "foo";
-export {foo as default} from "foo";
-export {foo as default, bar} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-from/expected.js b/test/fixtures/transformation/es6-modules-common-strict/exports-from/expected.js
deleted file mode 100644
index 5a4b431d17..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-from/expected.js
+++ /dev/null
@@ -1,27 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = function (obj) {
-  return obj && obj.constructor === Object ? obj : {
-    "default": obj
-  };
-};
-
-var _defaults = function (obj, defaults) {
-  for (var key in defaults) {
-    if (obj[key] === undefined) {
-      obj[key] = defaults[key];
-    }
-  }
-
-  return obj;
-};
-
-_defaults(exports, _interopRequireWildcard(require("foo")));
-
-exports.foo = require("foo").foo;
-exports.foo = require("foo").foo;
-exports.bar = require("foo").bar;
-exports.bar = require("foo").foo;
-exports["default"] = require("foo").foo;
-exports["default"] = require("foo").foo;
-exports.bar = require("foo").bar;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-named/actual.js b/test/fixtures/transformation/es6-modules-common-strict/exports-named/actual.js
deleted file mode 100644
index 8515ace759..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-named/actual.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export {foo};
-export {foo, bar};
-export {foo as bar};
-export {foo as default};
-export {foo as default, bar};
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-named/expected.js b/test/fixtures/transformation/es6-modules-common-strict/exports-named/expected.js
deleted file mode 100644
index ce378a6fb0..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-named/expected.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-exports.foo = foo;
-exports.foo = foo;
-exports.bar = bar;
-exports.bar = foo;
-exports["default"] = foo;
-exports["default"] = foo;
-exports.bar = bar;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-variable/actual.js b/test/fixtures/transformation/es6-modules-common-strict/exports-variable/actual.js
deleted file mode 100644
index c9cd5af09c..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-variable/actual.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export var foo = 1;
-export var foo = 1, bar = 2;
-export var foo2 = function () {};
-export var foo3;
-export let foo4 = 2;
-export let foo5;
-export const foo6 = 3;
-export function foo7 () {}
-export class foo8 {}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/exports-variable/expected.js b/test/fixtures/transformation/es6-modules-common-strict/exports-variable/expected.js
deleted file mode 100644
index 2c13db0878..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/exports-variable/expected.js
+++ /dev/null
@@ -1,15 +0,0 @@
-"use strict";
-
-exports.foo7 = foo7;
-var foo = exports.foo = 1;
-var foo = exports.foo = 1;
-var bar = exports.bar = 2;
-var foo2 = exports.foo2 = function () {};
-var foo3 = exports.foo3 = undefined;
-var foo4 = exports.foo4 = 2;
-var foo5 = exports.foo5 = undefined;
-var foo6 = exports.foo6 = 3;
-function foo7() {}
-var foo8 = function foo8() {};
-
-exports.foo8 = foo8;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/actual.js b/test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/actual.js
deleted file mode 100644
index 3c40b7d1c1..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/actual.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { isEven } from "./evens";
-
-export function nextOdd(n) {
-  return isEven(n) ? n + 1 : n + 2;
-}
-
-export var isOdd = (function (isEven) {
-  return function (n) {
-    return !isEven(n);
-  };
-})(isEven);
diff --git a/test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/expected.js b/test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/expected.js
deleted file mode 100644
index 5a074e1496..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/expected.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-exports.nextOdd = nextOdd;
-var isEven = require("./evens").isEven;
-function nextOdd(n) {
-  return isEven(n) ? n + 1 : n + 2;
-}
-
-var isOdd = exports.isOdd = (function (isEven) {
-  return function (n) {
-    return !isEven(n);
-  };
-})(isEven);
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-default/actual.js b/test/fixtures/transformation/es6-modules-common-strict/imports-default/actual.js
deleted file mode 100644
index 7a085cb1e3..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-default/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import foo from "foo";
-import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-default/expected.js b/test/fixtures/transformation/es6-modules-common-strict/imports-default/expected.js
deleted file mode 100644
index 02c8997cb6..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-default/expected.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-var _interopRequire = function (obj) {
-  return obj && (obj["default"] || obj);
-};
-
-var foo = _interopRequire(require("foo"));
-
-var foo2 = _interopRequire(require("foo"));
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-glob/actual.js b/test/fixtures/transformation/es6-modules-common-strict/imports-glob/actual.js
deleted file mode 100644
index e55c077500..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-glob/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-import * as foo from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-common-strict/imports-glob/expected.js
deleted file mode 100644
index d885f06222..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-glob/expected.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = function (obj) {
-  return obj && obj.constructor === Object ? obj : {
-    "default": obj
-  };
-};
-
-var foo = _interopRequireWildcard(require("foo"));
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-mixing/actual.js b/test/fixtures/transformation/es6-modules-common-strict/imports-mixing/actual.js
deleted file mode 100644
index ef78c95b1c..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-mixing/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-import foo, {baz as xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-mixing/expected.js b/test/fixtures/transformation/es6-modules-common-strict/imports-mixing/expected.js
deleted file mode 100644
index 09ea4cec86..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-mixing/expected.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-var _interopRequire = function (obj) {
-  return obj && (obj["default"] || obj);
-};
-
-var foo = _interopRequire(require("foo"));
-
-var xyz = require("foo").baz;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-named/actual.js b/test/fixtures/transformation/es6-modules-common-strict/imports-named/actual.js
deleted file mode 100644
index 6d50813b6f..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-named/actual.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import {bar} from "foo";
-import {bar2, baz} from "foo";
-import {bar as baz2} from "foo";
-import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports-named/expected.js b/test/fixtures/transformation/es6-modules-common-strict/imports-named/expected.js
deleted file mode 100644
index 6fa7137b22..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports-named/expected.js
+++ /dev/null
@@ -1,8 +0,0 @@
-"use strict";
-
-var bar = require("foo").bar;
-var bar2 = require("foo").bar2;
-var baz = require("foo").baz;
-var baz2 = require("foo").bar;
-var baz3 = require("foo").bar;
-var xyz = require("foo").xyz;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports/actual.js b/test/fixtures/transformation/es6-modules-common-strict/imports/actual.js
deleted file mode 100644
index 222b6885ac..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "foo";
-import "foo-bar";
-import "./directory/foo-bar";
diff --git a/test/fixtures/transformation/es6-modules-common-strict/imports/expected.js b/test/fixtures/transformation/es6-modules-common-strict/imports/expected.js
deleted file mode 100644
index f1a139f51a..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/imports/expected.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-require("foo");
-
-require("foo-bar");
-
-require("./directory/foo-bar");
diff --git a/test/fixtures/transformation/es6-modules-common-strict/options.json b/test/fixtures/transformation/es6-modules-common-strict/options.json
deleted file mode 100644
index 42fca89301..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "modules": "commonStrict"
-}
diff --git a/test/fixtures/transformation/es6-modules-common-strict/overview/actual.js b/test/fixtures/transformation/es6-modules-common-strict/overview/actual.js
deleted file mode 100644
index 589b4bd8cc..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/overview/actual.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import "foo";
-import "foo-bar";
-import "./directory/foo-bar";
-import foo from "foo";
-import * as foo2 from "foo";
-import {bar} from "foo";
-import {foo as bar2} from "foo";
-
-export {test};
-export var test = 5;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/overview/expected.js b/test/fixtures/transformation/es6-modules-common-strict/overview/expected.js
deleted file mode 100644
index a15f34dd81..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/overview/expected.js
+++ /dev/null
@@ -1,26 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = function (obj) {
-  return obj && obj.constructor === Object ? obj : {
-    "default": obj
-  };
-};
-
-var _interopRequire = function (obj) {
-  return obj && (obj["default"] || obj);
-};
-
-require("foo");
-
-require("foo-bar");
-
-require("./directory/foo-bar");
-
-var foo = _interopRequire(require("foo"));
-
-var foo2 = _interopRequireWildcard(require("foo"));
-
-var bar = require("foo").bar;
-var bar2 = require("foo").foo;
-exports.test = test;
-var test = exports.test = 5;
diff --git a/test/fixtures/transformation/es6-modules-common-strict/remap/actual.js b/test/fixtures/transformation/es6-modules-common-strict/remap/actual.js
deleted file mode 100644
index 79c234d8ae..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/remap/actual.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export var test = 2;
-test = 5;
-test++;
-
-(function () {
-  var test = 2;
-  test = 3;
-  test++;
-})();
diff --git a/test/fixtures/transformation/es6-modules-common-strict/remap/expected.js b/test/fixtures/transformation/es6-modules-common-strict/remap/expected.js
deleted file mode 100644
index 35eccf917c..0000000000
--- a/test/fixtures/transformation/es6-modules-common-strict/remap/expected.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-
-var test = exports.test = 2;
-test = exports.test = 5;
-test = exports.test += 1;
-
-(function () {
-  var test = 2;
-  test = 3;
-  test++;
-})();
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-default/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-default/actual.js
deleted file mode 100644
index 62923e5c15..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-default/actual.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default 42;
-export default {};
-export default [];
-export default foo;
-export default function () {}
-export default class {}
-export default function foo () {}
-export default class Foo {}
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-default/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-default/expected.js
deleted file mode 100644
index 2bcbf30aa6..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-default/expected.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports);
-  }
-})(function (exports) {
-  "use strict";
-
-  exports["default"] = foo;
-  exports["default"] = 42;
-  exports["default"] = {};
-  exports["default"] = [];
-  exports["default"] = foo;
-  exports["default"] = function () {};
-
-  exports["default"] = function () {};
-
-  function foo() {}
-  var Foo = function Foo() {};
-
-  exports["default"] = Foo;
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-default/untitled b/test/fixtures/transformation/es6-modules-umd-strict/exports-default/untitled
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-from/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-from/actual.js
deleted file mode 100644
index 60857f6542..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-from/actual.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "foo";
-export {foo} from "foo";
-export {foo, bar} from "foo";
-export {foo as bar} from "foo";
-export {foo as default} from "foo";
-export {foo as default, bar} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-from/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-from/expected.js
deleted file mode 100644
index 2b8ca3d179..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-from/expected.js
+++ /dev/null
@@ -1,35 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"));
-  }
-})(function (exports, _foo) {
-  "use strict";
-
-  var _interopRequireWildcard = function (obj) {
-    return obj && obj.constructor === Object ? obj : {
-      "default": obj
-    };
-  };
-
-  var _defaults = function (obj, defaults) {
-    for (var key in defaults) {
-      if (obj[key] === undefined) {
-        obj[key] = defaults[key];
-      }
-    }
-
-    return obj;
-  };
-
-  _defaults(exports, _interopRequireWildcard(_foo));
-
-  exports.foo = _foo.foo;
-  exports.foo = _foo.foo;
-  exports.bar = _foo.bar;
-  exports.bar = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports.bar = _foo.bar;
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-named/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-named/actual.js
deleted file mode 100644
index 8515ace759..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-named/actual.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export {foo};
-export {foo, bar};
-export {foo as bar};
-export {foo as default};
-export {foo as default, bar};
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-named/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-named/expected.js
deleted file mode 100644
index bb59a54207..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-named/expected.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports);
-  }
-})(function (exports) {
-  "use strict";
-
-  exports.foo = foo;
-  exports.foo = foo;
-  exports.bar = bar;
-  exports.bar = foo;
-  exports["default"] = foo;
-  exports["default"] = foo;
-  exports.bar = bar;
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-variable/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-variable/actual.js
deleted file mode 100644
index c9cd5af09c..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-variable/actual.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export var foo = 1;
-export var foo = 1, bar = 2;
-export var foo2 = function () {};
-export var foo3;
-export let foo4 = 2;
-export let foo5;
-export const foo6 = 3;
-export function foo7 () {}
-export class foo8 {}
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/exports-variable/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/exports-variable/expected.js
deleted file mode 100644
index 7cabcda1e3..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/exports-variable/expected.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports);
-  }
-})(function (exports) {
-  "use strict";
-
-  exports.foo7 = foo7;
-  var foo = exports.foo = 1;
-  var foo = exports.foo = 1;
-  var bar = exports.bar = 2;
-  var foo2 = exports.foo2 = function () {};
-  var foo3 = exports.foo3 = undefined;
-  var foo4 = exports.foo4 = 2;
-  var foo5 = exports.foo5 = undefined;
-  var foo6 = exports.foo6 = 3;
-  function foo7() {}
-  var foo8 = function foo8() {};
-
-  exports.foo8 = foo8;
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/hoist-function-exports/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/hoist-function-exports/actual.js
deleted file mode 100644
index 3c40b7d1c1..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/hoist-function-exports/actual.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { isEven } from "./evens";
-
-export function nextOdd(n) {
-  return isEven(n) ? n + 1 : n + 2;
-}
-
-export var isOdd = (function (isEven) {
-  return function (n) {
-    return !isEven(n);
-  };
-})(isEven);
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/hoist-function-exports/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/hoist-function-exports/expected.js
deleted file mode 100644
index e2ec28a22c..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/hoist-function-exports/expected.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "./evens"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("./evens"));
-  }
-})(function (exports, _evens) {
-  "use strict";
-
-  exports.nextOdd = nextOdd;
-  var isEven = _evens.isEven;
-  function nextOdd(n) {
-    return isEven(n) ? n + 1 : n + 2;
-  }
-
-  var isOdd = exports.isOdd = (function (isEven) {
-    return function (n) {
-      return !isEven(n);
-    };
-  })(isEven);
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-default/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-default/actual.js
deleted file mode 100644
index 7a085cb1e3..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-default/actual.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import foo from "foo";
-import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-default/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-default/expected.js
deleted file mode 100644
index 30aa739b11..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-default/expected.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"));
-  }
-})(function (exports, _foo) {
-  "use strict";
-
-  var _interopRequire = function (obj) {
-    return obj && (obj["default"] || obj);
-  };
-
-  var foo = _interopRequire(_foo);
-
-  var foo2 = _interopRequire(_foo);
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-glob/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-glob/actual.js
deleted file mode 100644
index e55c077500..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-glob/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-import * as foo from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-glob/expected.js
deleted file mode 100644
index 45a763f2f2..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-glob/expected.js
+++ /dev/null
@@ -1,11 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"));
-  }
-})(function (exports, _foo) {
-  "use strict";
-
-  var foo = _foo;
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-mixing/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-mixing/actual.js
deleted file mode 100644
index ef78c95b1c..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-mixing/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-import foo, {baz as xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-mixing/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-mixing/expected.js
deleted file mode 100644
index f677ceee86..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-mixing/expected.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"));
-  }
-})(function (exports, _foo) {
-  "use strict";
-
-  var _interopRequire = function (obj) {
-    return obj && (obj["default"] || obj);
-  };
-
-  var foo = _interopRequire(_foo);
-
-  var xyz = _foo.baz;
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-named/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-named/actual.js
deleted file mode 100644
index 6d50813b6f..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-named/actual.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import {bar} from "foo";
-import {bar2, baz} from "foo";
-import {bar as baz2} from "foo";
-import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports-named/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/imports-named/expected.js
deleted file mode 100644
index d4c162c172..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports-named/expected.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"));
-  }
-})(function (exports, _foo) {
-  "use strict";
-
-  var bar = _foo.bar;
-  var bar2 = _foo.bar2;
-  var baz = _foo.baz;
-  var baz2 = _foo.bar;
-  var baz3 = _foo.bar;
-  var xyz = _foo.xyz;
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/imports/actual.js
deleted file mode 100644
index 222b6885ac..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "foo";
-import "foo-bar";
-import "./directory/foo-bar";
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/imports/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/imports/expected.js
deleted file mode 100644
index 2e39b15cd2..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/imports/expected.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
-  }
-})(function (exports, _foo, _fooBar, _directoryFooBar) {
-  "use strict";
-});
\ No newline at end of file
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/module-name/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/module-name/actual.js
deleted file mode 100644
index f3b473756e..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/module-name/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-foobar();
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/module-name/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/module-name/expected.js
deleted file mode 100644
index b7468340e9..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/module-name/expected.js
+++ /dev/null
@@ -1,11 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define("es6-modules-umd-strict/module-name/expected", ["exports"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports);
-  }
-})(function (exports) {
-  "use strict";
-
-  foobar();
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/module-name/options.json b/test/fixtures/transformation/es6-modules-umd-strict/module-name/options.json
deleted file mode 100644
index a2868455b4..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/module-name/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "amdModuleIds": true
-}
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/options.json b/test/fixtures/transformation/es6-modules-umd-strict/options.json
deleted file mode 100644
index faa5fe6355..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "modules": "umdStrict"
-}
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/overview/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/overview/actual.js
deleted file mode 100644
index 1623f8b61e..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/overview/actual.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import "foo";
-import "foo-bar";
-import "./directory/foo-bar";
-import foo from "foo";
-import * as foo2 from "foo";
-import {bar} from "foo";
-import {foo as bar2} from "foo";
-
-export {test};
-export var test2 = 5;
-
-export default test;
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/overview/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/overview/expected.js
deleted file mode 100644
index 8bc9500a22..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/overview/expected.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
-  }
-})(function (exports, _foo, _fooBar, _directoryFooBar) {
-  "use strict";
-
-  var _interopRequire = function (obj) {
-    return obj && (obj["default"] || obj);
-  };
-
-  var foo = _interopRequire(_foo);
-
-  var foo2 = _foo;
-  var bar = _foo.bar;
-  var bar2 = _foo.foo;
-  exports.test = test;
-  var test2 = exports.test2 = 5;
-
-  exports["default"] = test;
-});
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/remap/actual.js b/test/fixtures/transformation/es6-modules-umd-strict/remap/actual.js
deleted file mode 100644
index 79c234d8ae..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/remap/actual.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export var test = 2;
-test = 5;
-test++;
-
-(function () {
-  var test = 2;
-  test = 3;
-  test++;
-})();
diff --git a/test/fixtures/transformation/es6-modules-umd-strict/remap/expected.js b/test/fixtures/transformation/es6-modules-umd-strict/remap/expected.js
deleted file mode 100644
index 99e5928e2d..0000000000
--- a/test/fixtures/transformation/es6-modules-umd-strict/remap/expected.js
+++ /dev/null
@@ -1,19 +0,0 @@
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports);
-  }
-})(function (exports) {
-  "use strict";
-
-  var test = exports.test = 2;
-  test = exports.test = 5;
-  test = exports.test += 1;
-
-  (function () {
-    var test = 2;
-    test = 3;
-    test++;
-  })();
-});
\ No newline at end of file