diff --git a/core/utils/keycodes.js b/core/utils/keycodes.js
index a5be94cb8..586d2f97e 100644
--- a/core/utils/keycodes.js
+++ b/core/utils/keycodes.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.KeyCodes
  * @namespace
  */
-goog.provide('Blockly.utils.KeyCodes');
+goog.module('Blockly.utils.KeyCodes');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -29,7 +30,7 @@ goog.provide('Blockly.utils.KeyCodes');
  *
  * @enum {number}
  */
-Blockly.utils.KeyCodes = {
+const KeyCodes = {
   WIN_KEY_FF_LINUX: 0,
   MAC_ENTER: 3,
   BACKSPACE: 8,
@@ -166,3 +167,5 @@ Blockly.utils.KeyCodes = {
   // http://en.community.dell.com/support-forums/laptop/f/3518/p/19285957/19523128.aspx
   PHANTOM: 255
 };
+
+exports = KeyCodes;
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..45860bd0c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -176,7 +176,7 @@ goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecatio
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
-goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);
+goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);