diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/actual.js
new file mode 100644
index 0000000000..8e0a0581b7
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/actual.js
@@ -0,0 +1 @@
+export * from 'mod';
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/expected.js
new file mode 100644
index 0000000000..2e326dcdc6
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/expected.js
@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _mod = require('mod');
+
+var _loop = function (_key2) {
+  if (_key2 === "default") return 'continue';
+  Object.defineProperty(exports, _key2, {
+    enumerable: true,
+    get: function () {
+      return _mod[_key2];
+    }
+  });
+};
+
+for (var _key2 in _mod) {
+  var _ret = _loop(_key2);
+
+  if (_ret === 'continue') continue;
+}
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/options.json b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/options.json
new file mode 100644
index 0000000000..c96d00e02b
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-all/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "transform-es2015-block-scoping",
+    "transform-es2015-modules-commonjs"
+  ]
+}
diff --git a/packages/babel-traverse/src/path/modification.js b/packages/babel-traverse/src/path/modification.js
index 8d045437b0..9031cc7ea0 100644
--- a/packages/babel-traverse/src/path/modification.js
+++ b/packages/babel-traverse/src/path/modification.js
@@ -49,8 +49,8 @@ export function _containerInsert(from, nodes) {
       paths.push(path);
     } else {
       paths.push(NodePath.get({
-        parentPath: this,
-        parent: node,
+        parentPath: this.parentPath,
+        parent: this.parent,
         container: this.container,
         listKey: this.listKey,
         key: to