diff --git a/packages/babel-helper-fixtures/src/index.js b/packages/babel-helper-fixtures/src/index.js
index da22a14ec6..dcf01d8b61 100644
--- a/packages/babel-helper-fixtures/src/index.js
+++ b/packages/babel-helper-fixtures/src/index.js
@@ -124,6 +124,7 @@ export default function get(entryLoc): Array<Suite> {
         if (ext !== ".js" && ext !== ".mjs") return;
 
         execLoc = taskDir;
+        execLocAlias = suiteName + "/" + taskName;
       }
 
       if (resolve.relative(expectLoc + "on")) {
diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js
index 77009ec0dc..407a848166 100644
--- a/packages/babel-helper-transform-fixture-test-runner/src/index.js
+++ b/packages/babel-helper-transform-fixture-test-runner/src/index.js
@@ -329,7 +329,10 @@ function run(task) {
     const newOpts = merge(
       {
         filename: self.loc,
+        filenameRelative: self.filename,
+        sourceFileName: self.filename,
         sourceType: "unambiguous",
+        babelrc: false,
       },
       opts,
     );
@@ -377,7 +380,15 @@ function run(task) {
   let actualCode = actual.code;
   const expectCode = expected.code;
   if (!execCode || actualCode) {
-    result = babel.transform(actualCode, getOpts(actual));
+    result = babel.transform(
+      actualCode,
+      Object.assign(
+        {
+          sourceMapTarget: task.expect.filename,
+        },
+        getOpts(actual),
+      ),
+    );
     checkDuplicatedNodes(result.ast);
     if (
       !expected.code &&
@@ -444,10 +455,6 @@ export default function(
               }
 
               defaults(task.options, {
-                filenameRelative: task.expect.filename,
-                sourceFileName: task.actual.filename,
-                sourceMapTarget: task.expect.filename,
-                babelrc: false,
                 sourceMap: !!(task.sourceMappings || task.sourceMap),
               });
 
diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/output.js
index a869bce301..46d5e5e274 100644
--- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/output.js
+++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/output.js
@@ -1,4 +1,4 @@
-define("amd/module-name/output", [], function () {
+define("amd/module-name/input", [], function () {
   "use strict";
 
   foobar();
diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/output.js
index 347aadf7a0..253b4805f7 100644
--- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/output.js
+++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/output.js
@@ -1,4 +1,4 @@
-define("loose/module-name/output", [], function () {
+define("loose/module-name/input", [], function () {
   "use strict";
 
   foobar();
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js
index 0bc010d814..516c1e9a10 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/output.js
@@ -1,6 +1,6 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define("loose/module-name-with-overridden-global/output", ["exports"], factory);
+    define("loose/module-name-with-overridden-global/input", ["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
@@ -8,7 +8,7 @@
       exports: {}
     };
     factory(mod.exports);
-    global.looseModuleNameWithOverriddenGlobalOutput = mod.exports;
+    global.looseModuleNameWithOverriddenGlobalInput = mod.exports;
   }
 })(this, function (_exports) {
   "use strict";
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/output.js
index 31d43cd38b..37b3679166 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/output.js
@@ -1,6 +1,6 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define("loose/module-name/output", [], factory);
+    define("loose/module-name/input", [], factory);
   } else if (typeof exports !== "undefined") {
     factory();
   } else {
@@ -8,7 +8,7 @@
       exports: {}
     };
     factory();
-    global.looseModuleNameOutput = mod.exports;
+    global.looseModuleNameInput = mod.exports;
   }
 })(this, function () {
   "use strict";
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js
index f72bc963fe..b17d582429 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/output.js
@@ -1,6 +1,6 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define("umd/module-name-with-overridden-global/output", ["exports"], factory);
+    define("umd/module-name-with-overridden-global/input", ["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   } else {
@@ -8,7 +8,7 @@
       exports: {}
     };
     factory(mod.exports);
-    global.umdModuleNameWithOverriddenGlobalOutput = mod.exports;
+    global.umdModuleNameWithOverriddenGlobalInput = mod.exports;
   }
 })(this, function (_exports) {
   "use strict";
diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js
index e182498848..3967f52000 100644
--- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js
+++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/output.js
@@ -1,6 +1,6 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define("umd/module-name/output", [], factory);
+    define("umd/module-name/input", [], factory);
   } else if (typeof exports !== "undefined") {
     factory();
   } else {
@@ -8,7 +8,7 @@
       exports: {}
     };
     factory();
-    global.umdModuleNameOutput = mod.exports;
+    global.umdModuleNameInput = mod.exports;
   }
 })(this, function () {
   "use strict";