diff --git a/test/fixtures/transformation/es6-modules-amd/remap/actual.js b/test/fixtures/transformation/es6-modules-amd/remap/actual.js
new file mode 100644
index 0000000000..7345a055a5
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-amd/remap/actual.js
@@ -0,0 +1,7 @@
+export var test = 2;
+test = 5;
+
+(function () {
+  var test = 2;
+  test = 3;
+})();
diff --git a/test/fixtures/transformation/es6-modules-amd/remap/expected.js b/test/fixtures/transformation/es6-modules-amd/remap/expected.js
new file mode 100644
index 0000000000..5fc760fd92
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-amd/remap/expected.js
@@ -0,0 +1,11 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  var test = exports.test = 2;
+  test = 5;
+
+  (function () {
+    var test = 2;
+    test = 3;
+  })();
+});
diff --git a/test/fixtures/transformation/es6-modules-common/remap/actual.js b/test/fixtures/transformation/es6-modules-common/remap/actual.js
new file mode 100644
index 0000000000..7345a055a5
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/remap/actual.js
@@ -0,0 +1,7 @@
+export var test = 2;
+test = 5;
+
+(function () {
+  var test = 2;
+  test = 3;
+})();
diff --git a/test/fixtures/transformation/es6-modules-common/remap/expected.js b/test/fixtures/transformation/es6-modules-common/remap/expected.js
new file mode 100644
index 0000000000..f4f8f05b7b
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/remap/expected.js
@@ -0,0 +1,9 @@
+"use strict";
+
+var test = exports.test = 2;
+test = exports.test = 5;
+
+(function () {
+  var test = 2;
+  test = 3;
+})();
diff --git a/test/fixtures/transformation/es6-modules-ignore/remap/actual.js b/test/fixtures/transformation/es6-modules-ignore/remap/actual.js
new file mode 100644
index 0000000000..7345a055a5
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-ignore/remap/actual.js
@@ -0,0 +1,7 @@
+export var test = 2;
+test = 5;
+
+(function () {
+  var test = 2;
+  test = 3;
+})();
diff --git a/test/fixtures/transformation/es6-modules-ignore/remap/expected.js b/test/fixtures/transformation/es6-modules-ignore/remap/expected.js
new file mode 100644
index 0000000000..15120d6616
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-ignore/remap/expected.js
@@ -0,0 +1,9 @@
+"use strict";
+
+var test = 2;
+test = 5;
+
+(function () {
+  var test = 2;
+  test = 3;
+})();
diff --git a/test/fixtures/transformation/es6-modules-umd/remap/actual.js b/test/fixtures/transformation/es6-modules-umd/remap/actual.js
new file mode 100644
index 0000000000..7345a055a5
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-umd/remap/actual.js
@@ -0,0 +1,7 @@
+export var test = 2;
+test = 5;
+
+(function () {
+  var test = 2;
+  test = 3;
+})();
diff --git a/test/fixtures/transformation/es6-modules-umd/remap/expected.js b/test/fixtures/transformation/es6-modules-umd/remap/expected.js
new file mode 100644
index 0000000000..0fe2bbd0f4
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-umd/remap/expected.js
@@ -0,0 +1,17 @@
+(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 = 5;
+
+  (function () {
+    var test = 2;
+    test = 3;
+  })();
+});