-diff --git i/Cakefile.js w/Cakefile.js
-index 63532f7..39c3036 100644
---- i/Cakefile.js
-+++ w/Cakefile.js
-@@ -81,8 +81,17 @@ var visitDirectory = (directory, visitor) =>
+diff --git a/Cakefile.js b/Cakefile.js
+index 32da02e..a6c01ce 100644
+--- a/Cakefile.js
++++ b/Cakefile.js
+@@ -80,8 +80,17 @@ var visitDirectory = (directory, visitor) =>
      return visitor(filepath);
    });
  task('build', 'compile all coffeescript files to javascript', () => {

     <script type="text/javascript" src="../lib/utils.js"></script>
     <script type="text/javascript" src="../lib/dom_utils.js"></script>
     <script type="text/javascript" src="../lib/settings.js"></script>
     <script type="text/javascript" src="../lib/keyboard_utils.js"></script>
diff --git i/pages/vomnibar.html w/pages/vomnibar.html
index 87acc08..392c03f 100644
--- i/pages/vomnibar.html
+++ w/pages/vomnibar.html
@@ -1,6 +1,7 @@
 <html>
   <head>

     <script type="text/javascript" src="../lib/utils.js"></script>
     <script type="text/javascript" src="../lib/settings.js"></script>
     <script type="text/javascript" src="../lib/keyboard_utils.js"></script>
diff --git a/src/tests/unit_tests/commands_test.js b/src/tests/unit_tests/commands_test.js
index 93a7443..f43706b 100644
--- a/src/tests/unit_tests/commands_test.js
+++ b/src/tests/unit_tests/commands_test.js
@@ -32,7 +32,7 @@ global.Settings = { postUpdateHooks: {}, get() { return ''; }, set() {} };
 const { Commands } = require('../../background_scripts/commands.js');

 // Include mode_normal to check that all commands have been implemented.
-global.KeyHandlerMode = (global.Mode = {});
+global.KeyHandlerMode = (global.Mode = class {});
 global.KeyboardUtils = { platform: '' };
 extend(global, require('../../content_scripts/link_hints.js'));
 extend(global, require('../../content_scripts/marks.js'));
diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html
index 37cd43e..11da579 100644
--- a/tests/dom_tests/dom_tests.html
+++ b/tests/dom_tests/dom_tests.html
@@ -29,6 +29,7 @@
     <link rel="stylesheet" type="text/css" href="../../content_scripts/vimium.css" />
     <script type="text/javascript" src="bind.js"></script>
