diff --git a/framework/inspector/console-agent.sky b/framework/inspector/console-agent.sky
index 9ce5b1795f2..58240d81eb7 100644
--- a/framework/inspector/console-agent.sky
+++ b/framework/inspector/console-agent.sky
@@ -8,5 +8,5 @@ ConsoleAgent.prototype.enable = function() {
   };
 };
 
-this.exports = ConsoleAgent;
+module.exports = ConsoleAgent;
 </script>
diff --git a/framework/inspector/dom-agent.sky b/framework/inspector/dom-agent.sky
index 91b6a3ecd39..23cb8f5c659 100644
--- a/framework/inspector/dom-agent.sky
+++ b/framework/inspector/dom-agent.sky
@@ -165,5 +165,5 @@ DOMAgent.prototype.mutationCallback_ = function(mutationRecords) {
   }
 };
 
-this.exports = DOMAgent;
+module.exports = DOMAgent;
 </script>
diff --git a/framework/inspector/indexeddb-agent.sky b/framework/inspector/indexeddb-agent.sky
index 670ba14219d..9063860f2f8 100644
--- a/framework/inspector/indexeddb-agent.sky
+++ b/framework/inspector/indexeddb-agent.sky
@@ -7,5 +7,5 @@ IndexedDB.prototype.requestDatabaseNames = function() {
   return { "databaseNames": [] };
 };
 
-this.exports = IndexedDB;
+module.exports = IndexedDB;
 </script>
diff --git a/framework/inspector/page-agent.sky b/framework/inspector/page-agent.sky
index c0900b7d6d7..31078a57444 100644
--- a/framework/inspector/page-agent.sky
+++ b/framework/inspector/page-agent.sky
@@ -34,5 +34,5 @@ Page.prototype.getResourceTree = function() {
   };
 };
 
-this.exports = Page;
+module.exports = Page;
 </script>
diff --git a/framework/inspector/runtime-agent.sky b/framework/inspector/runtime-agent.sky
index ce42d4f9571..fa0cc2c63f8 100644
--- a/framework/inspector/runtime-agent.sky
+++ b/framework/inspector/runtime-agent.sky
@@ -117,5 +117,5 @@ Runtime.prototype.evaluate = function(params) {
 
 Runtime.prototype.getProperties = debug.loggingStub("getProperties");
 
-this.exports = Runtime;
+module.exports = Runtime;
 </script>
diff --git a/framework/inspector/worker-agent.sky b/framework/inspector/worker-agent.sky
index addbc2c04da..580b6b3d751 100644
--- a/framework/inspector/worker-agent.sky
+++ b/framework/inspector/worker-agent.sky
@@ -8,5 +8,5 @@ WorkerAgent.prototype.canInspectWorkers = function() {
   };
 };
 
-this.exports = WorkerAgent;
+module.exports = WorkerAgent;
 </script>
diff --git a/framework/shell.sky b/framework/shell.sky
index de45b7e35f4..838b2adaf76 100644
--- a/framework/shell.sky
+++ b/framework/shell.sky
@@ -16,7 +16,7 @@ function connectToService(url, service, client) {
   return wrapHandle(handle, service, client);
 }
 
-this.exports = {
+module.exports = {
   connectToService: connectToService,
   wrapHandle: wrapHandle,
 };
diff --git a/framework/xmlhttprequest.sky b/framework/xmlhttprequest.sky
index 6f23fac9f45..33f6704cc58 100644
--- a/framework/xmlhttprequest.sky
+++ b/framework/xmlhttprequest.sky
@@ -41,5 +41,5 @@ XMLHttpRequest.prototype.send = function() {
   });
 };
 
-this.exports = XMLHttpRequest;
+module.exports = XMLHttpRequest;
 </script>
diff --git a/tests/custom-elements/resources/document-register-fuzz.sky b/tests/custom-elements/resources/document-register-fuzz.sky
index bf6c66a6890..494af737ddb 100644
--- a/tests/custom-elements/resources/document-register-fuzz.sky
+++ b/tests/custom-elements/resources/document-register-fuzz.sky
@@ -52,7 +52,7 @@ function register(name, options)
     } catch (e) { console.log(e); }
 }
 
-this.exports = {
+module.exports = {
     setupObjectHooks: setupObjectHooks,
     exerciseDocumentRegister: exerciseDocumentRegister,
     register: register,
diff --git a/tests/modules/resources/intermediate.sky b/tests/modules/resources/intermediate.sky
index 57fc7f57311..3884a41e42e 100644
--- a/tests/modules/resources/intermediate.sky
+++ b/tests/modules/resources/intermediate.sky
@@ -1,7 +1,7 @@
 <link rel="import" href="../../resources/dump-as-text.sky" />
 <link rel="import" href="pass.sky" as="banana" />
 <script>
-this.exports = {
+module.exports = {
   message: banana,
 };
 </script>
diff --git a/tests/modules/resources/pass.sky b/tests/modules/resources/pass.sky
index c98a6a9ddaa..8e9cf9b54e9 100644
--- a/tests/modules/resources/pass.sky
+++ b/tests/modules/resources/pass.sky
@@ -1,3 +1,3 @@
 <script>
-this.exports = "PASS: pass.sky succesfully exported this string."
+module.exports = "PASS: pass.sky succesfully exported this string."
 </script>
diff --git a/viewer/script/core.html b/viewer/script/core.html
index 56693f753af..0ca4b86c7b2 100644
--- a/viewer/script/core.html
+++ b/viewer/script/core.html
@@ -1,3 +1,3 @@
 <script>
-this.exports = internals.core;
+module.exports = internals.core;
 </script>
diff --git a/viewer/script/support.html b/viewer/script/support.html
index d70d307756e..42448e1c02c 100644
--- a/viewer/script/support.html
+++ b/viewer/script/support.html
@@ -1,3 +1,3 @@
 <script>
-this.exports = internals.support;
+module.exports = internals.support;
 </script>