diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 4b038ab1c4c..7c435176b9c 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -5207,6 +5207,7 @@ module ts {
             }
 
             function emitAMDModule(node: SourceFile, startIndex: number) {
+                createExternalModuleInfo(node);
                 writeLine();
                 write("define(");
                 sortAMDModules(node.amdDependencies);
@@ -5257,6 +5258,16 @@ module ts {
             }
 
             function emitCommonJSModule(node: SourceFile, startIndex: number) {
+                createExternalModuleInfo(node);
+                emitCaptureThisForNodeIfNecessary(node);
+                emitLinesStartingAt(node.statements, startIndex);
+                emitTempDeclarations(/*newLine*/ true);
+                emitExportDefault(node, /*emitAsReturn*/ false);
+            }
+
+            function emitES6Module(node: SourceFile, startIndex: number) {
+                externalImports = undefined;
+                exportSpecifiers = undefined;
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
                 emitTempDeclarations(/*newLine*/ true);
@@ -5323,13 +5334,15 @@ module ts {
                     extendsEmitted = true;
                 }
                 if (isExternalModule(node)) {
-                    createExternalModuleInfo(node);
                     if (compilerOptions.module === ModuleKind.AMD) {
                         emitAMDModule(node, startIndex);
                     }
-                    else {
+                    else if (compilerOptions.module === ModuleKind.CommonJS || compilerOptions.target < ScriptTarget.ES6) {
                         emitCommonJSModule(node, startIndex);
                     }
+                    else {
+                        emitES6Module(node, startIndex);
+                    }
                 }
                 else {
                     externalImports = undefined;
diff --git a/tests/baselines/reference/es6ExportAssignment.js b/tests/baselines/reference/es6ExportAssignment.js
index 7d603282b0c..4a4e0368bb7 100644
--- a/tests/baselines/reference/es6ExportAssignment.js
+++ b/tests/baselines/reference/es6ExportAssignment.js
@@ -5,4 +5,3 @@ export = a;
 
 //// [es6ExportAssignment.js]
 var a = 10;
-module.exports = a;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js
index 765d09fae79..2c234b60ae8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.js
@@ -22,19 +22,12 @@ var x1: number = defaultBinding6;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1_0.js]
 var a = 10;
-module.exports = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1_1.js]
-var defaultBinding1 = require("es6ImportDefaultBindingFollowedWithNamedImport1_0");
 var x1 = defaultBinding1;
-var defaultBinding2 = require("es6ImportDefaultBindingFollowedWithNamedImport1_0");
 var x1 = defaultBinding2;
-var defaultBinding3 = require("es6ImportDefaultBindingFollowedWithNamedImport1_0");
 var x1 = defaultBinding3;
-var defaultBinding4 = require("es6ImportDefaultBindingFollowedWithNamedImport1_0");
 var x1 = defaultBinding4;
-var defaultBinding5 = require("es6ImportDefaultBindingFollowedWithNamedImport1_0");
 var x1 = defaultBinding5;
-var defaultBinding6 = require("es6ImportDefaultBindingFollowedWithNamedImport1_0");
 var x1 = defaultBinding6;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
index 1241140b121..a67436de60c 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
@@ -11,7 +11,6 @@ var x: number = nameSpaceBinding.a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js]
 exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js]
-var defaultBinding = require("es6ImportDefaultBindingFollowedWithNamespaceBinding_0");
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js
index 7f67628c18e..f2a31d6c662 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js
@@ -11,9 +11,7 @@ var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js]
 var a = 10;
-module.exports = a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js]
-var defaultBinding = require("es6ImportDefaultBindingFollowedWithNamespaceBinding_0");
 var x = defaultBinding;
 
 
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration.js b/tests/baselines/reference/es6ImportEqualsDeclaration.js
index 47cfd288632..5195bdc631b 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration.js
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration.js
@@ -10,5 +10,4 @@ import a = require("server");
 
 //// [server.js]
 var a = 10;
-module.exports = a;
 //// [client.js]
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.js b/tests/baselines/reference/es6ImportNamedImportParsingError.js
index f9d8e90f707..4b60b26f88d 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.js
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.js
@@ -24,5 +24,4 @@ from;
 }
 from;
 "es6ImportNamedImportParsingError_0";
-var _module_1 = require();
 "es6ImportNamedImportParsingError_0";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClause.js b/tests/baselines/reference/es6ImportWithoutFromClause.js
index 2f35122571f..99d12a4107e 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClause.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClause.js
@@ -11,7 +11,6 @@ import "es6ImportWithoutFromClause_0";
 //// [es6ImportWithoutFromClause_0.js]
 exports.a = 10;
 //// [es6ImportWithoutFromClause_1.js]
-require("es6ImportWithoutFromClause_0");
 
 
 //// [es6ImportWithoutFromClause_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
index a0d88a5cf8c..c676222ce81 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
@@ -10,7 +10,6 @@ import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
 
 //// [es6ImportWithoutFromClauseNonInstantiatedModule_0.js]
 //// [es6ImportWithoutFromClauseNonInstantiatedModule_1.js]
-require("es6ImportWithoutFromClauseNonInstantiatedModule_0");
 
 
 //// [es6ImportWithoutFromClauseNonInstantiatedModule_0.d.ts]