diff --git a/src/babel/transformation/transformers/other/runtime.js b/src/babel/transformation/transformers/other/runtime.js
index c13b37d2c0..cefaa830a9 100644
--- a/src/babel/transformation/transformers/other/runtime.js
+++ b/src/babel/transformation/transformers/other/runtime.js
@@ -1,8 +1,8 @@
 import core from "core-js/library";
 import includes from "lodash/collection/includes";
-import * as util from  "../../util";
+import * as util from  "../../../util";
 import has from "lodash/object/has";
-import * as t from "../../types";
+import * as t from "../../../types";
 
 var isSymbolIterator = t.buildMatchMemberExpression("Symbol.iterator");
 
@@ -96,4 +96,3 @@ exports.Identifier = function (node, parent, scope, file) {
     return file.get("regeneratorIdentifier");
   }
 };
-};
diff --git a/test/core/fixtures/transformation/runtime/aliased-constructors/expected.js b/test/core/fixtures/transformation/runtime/aliased-constructors/expected.js
index 8c8ef8412e..71a45ff0b9 100644
--- a/test/core/fixtures/transformation/runtime/aliased-constructors/expected.js
+++ b/test/core/fixtures/transformation/runtime/aliased-constructors/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _core = require("babel-runtime/es5/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 
 obj.constructor === Object;
 obj.constructor === _core.Promise;
diff --git a/test/core/fixtures/transformation/runtime/es6-for-of/expected.js b/test/core/fixtures/transformation/runtime/es6-for-of/expected.js
index 020a30f981..704f8c2bcf 100644
--- a/test/core/fixtures/transformation/runtime/es6-for-of/expected.js
+++ b/test/core/fixtures/transformation/runtime/es6-for-of/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _core = require("babel-runtime/es5/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 
 var _iteratorNormalCompletion = true;
 var _didIteratorError = false;
diff --git a/test/core/fixtures/transformation/runtime/es7-array-comprehensions/expected.js b/test/core/fixtures/transformation/runtime/es7-array-comprehensions/expected.js
index dced63de98..949934ca11 100644
--- a/test/core/fixtures/transformation/runtime/es7-array-comprehensions/expected.js
+++ b/test/core/fixtures/transformation/runtime/es7-array-comprehensions/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _core = require("babel-runtime/es5/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 
 var arr = (function () {
   var _arr = [];
diff --git a/test/core/fixtures/transformation/runtime/full/expected.js b/test/core/fixtures/transformation/runtime/full/expected.js
index 99f72acb8b..57046122e4 100644
--- a/test/core/fixtures/transformation/runtime/full/expected.js
+++ b/test/core/fixtures/transformation/runtime/full/expected.js
@@ -1,12 +1,12 @@
 "use strict";
 
-var _core = require("babel-runtime/es5/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 
-var _regeneratorRuntime = require("babel-runtime/es5/regenerator")["default"];
+var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
 
-var _interopRequire = require("babel-runtime/es5/helpers/interop-require")["default"];
+var _interopRequire = require("babel-runtime/helpers/interop-require")["default"];
 
-var _interopRequireWildcard = require("babel-runtime/es5/helpers/interop-require-wildcard")["default"];
+var _interopRequireWildcard = require("babel-runtime/helpers/interop-require-wildcard")["default"];
 
 _core.Object.defineProperty(exports, "__esModule", {
   value: true
diff --git a/test/core/fixtures/transformation/runtime/modules-amd/expected.js b/test/core/fixtures/transformation/runtime/modules-amd/expected.js
index 8200e078b4..7dc00c5d50 100644
--- a/test/core/fixtures/transformation/runtime/modules-amd/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-amd/expected.js
@@ -1,7 +1,7 @@
-define(["exports", "foo", "babel-runtime/es5/helpers/interop-require"], function (exports, _foo, _babelRuntimeEs5HelpersInteropRequire) {
+define(["exports", "foo", "babel-runtime/helpers/interop-require"], function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
   "use strict";
 
-  var _foo2 = _babelRuntimeEs5HelpersInteropRequire["default"](_foo);
+  var _foo2 = _babelRuntimeHelpersInteropRequire["default"](_foo);
 
   _foo2;
 });
diff --git a/test/core/fixtures/transformation/runtime/modules-common/expected.js b/test/core/fixtures/transformation/runtime/modules-common/expected.js
index 7ee37d3901..532d321985 100644
--- a/test/core/fixtures/transformation/runtime/modules-common/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-common/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequire = require("babel-runtime/es5/helpers/interop-require")["default"];
+var _interopRequire = require("babel-runtime/helpers/interop-require")["default"];
 
 var _foo = require("foo");
 
diff --git a/test/core/fixtures/transformation/runtime/modules-system/expected.js b/test/core/fixtures/transformation/runtime/modules-system/expected.js
index 2c68358ed0..adcb2aaba3 100644
--- a/test/core/fixtures/transformation/runtime/modules-system/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-system/expected.js
@@ -1,11 +1,11 @@
-System.register(["babel-runtime/es5/helpers/to-consumable-array", "babel-runtime/es5/regenerator"], function (_export) {
+System.register(["babel-runtime/helpers/to-consumable-array", "babel-runtime/regenerator"], function (_export) {
   var _toConsumableArray, _regeneratorRuntime, generator;
 
   return {
-    setters: [function (_babelRuntimeEs5HelpersToConsumableArray) {
-      _toConsumableArray = _babelRuntimeEs5HelpersToConsumableArray["default"];
-    }, function (_babelRuntimeEs5Regenerator) {
-      _regeneratorRuntime = _babelRuntimeEs5Regenerator["default"];
+    setters: [function (_babelRuntimeHelpersToConsumableArray) {
+      _toConsumableArray = _babelRuntimeHelpersToConsumableArray["default"];
+    }, function (_babelRuntimeRegenerator) {
+      _regeneratorRuntime = _babelRuntimeRegenerator["default"];
     }],
     execute: function () {
       "use strict";
@@ -29,4 +29,4 @@ System.register(["babel-runtime/es5/helpers/to-consumable-array", "babel-runtime
       foo.apply(undefined, _toConsumableArray(bar));
     }
   };
-});
\ No newline at end of file
+});
diff --git a/test/core/fixtures/transformation/runtime/modules-umd/expected.js b/test/core/fixtures/transformation/runtime/modules-umd/expected.js
index 2df9cf4bb1..70ea96c1e2 100644
--- a/test/core/fixtures/transformation/runtime/modules-umd/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-umd/expected.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "babel-runtime/es5/helpers/interop-require"], factory);
+    define(["exports", "foo", "babel-runtime/helpers/interop-require"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"), require("babel-runtime/es5/helpers/interop-require"));
+    factory(exports, require("foo"), require("babel-runtime/helpers/interop-require"));
   } else {
     var module = {
       exports: {}
@@ -10,8 +10,8 @@
     factory(module.exports, global.foo, global._interopRequire);
     global.actual = module.exports;
   }
-})(this, function (exports, _foo, _babelRuntimeEs5HelpersInteropRequire) {
+})(this, function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
   "use strict";
 
-  var _foo2 = _babelRuntimeEs5HelpersInteropRequire["default"](_foo);
+  var _foo2 = _babelRuntimeHelpersInteropRequire["default"](_foo);
 });
diff --git a/test/core/fixtures/transformation/runtime/regenerator-runtime/expected.js b/test/core/fixtures/transformation/runtime/regenerator-runtime/expected.js
index 4458814fc4..e9871b174e 100644
--- a/test/core/fixtures/transformation/runtime/regenerator-runtime/expected.js
+++ b/test/core/fixtures/transformation/runtime/regenerator-runtime/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _regeneratorRuntime = require("babel-runtime/es5/regenerator")["default"];
+var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
 
 void _regeneratorRuntime.mark(function callee$0$0() {
   return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
diff --git a/test/core/fixtures/transformation/runtime/symbol-iterator-in/expected.js b/test/core/fixtures/transformation/runtime/symbol-iterator-in/expected.js
index d7d8007291..7e47791543 100644
--- a/test/core/fixtures/transformation/runtime/symbol-iterator-in/expected.js
+++ b/test/core/fixtures/transformation/runtime/symbol-iterator-in/expected.js
@@ -1,5 +1,5 @@
 "use strict";
 
-var _core = require("babel-runtime/es5/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 
 _core.isIterable(Object(arr));