diff --git a/neutrino-custom/base.js b/neutrino-custom/base.js
index 926bfa14d..5a9247d25 100644
--- a/neutrino-custom/base.js
+++ b/neutrino-custom/base.js
@@ -255,7 +255,6 @@ module.exports = neutrino => {
             treeherder: require.resolve(path.join(UI, 'js/treeherder.js')),
             treeherderApp: require.resolve(path.join(UI, 'js/treeherder_app.js')),
             perf: require.resolve(path.join(UI, 'js/perf.js')),
-            logViewerApp: require.resolve(path.join(UI, 'js/logviewer.js')),
         });
 
     neutrino.config.devtool('source-map');
diff --git a/neutrino-custom/lint.js b/neutrino-custom/lint.js
index a7122b0e0..ab58d914e 100644
--- a/neutrino-custom/lint.js
+++ b/neutrino-custom/lint.js
@@ -84,7 +84,6 @@ module.exports = neutrino => {
                     '_',
                     'angular',
                     'jQuery',
-                    'logViewerApp',
                     'Mousetrap',
                     'perf',
                     'React',
diff --git a/tests/ui/unit/init.js b/tests/ui/unit/init.js
index 4e38eb3d8..38c3fca24 100644
--- a/tests/ui/unit/init.js
+++ b/tests/ui/unit/init.js
@@ -29,7 +29,6 @@ const jsContext = require.context('../../../ui/js', true, /^\.\/.*\.jsx?$/);
 window.treeherder = jsContext('./treeherder.js');
 window.treeherderApp = jsContext('./treeherder_app.js');
 window.perf = jsContext('./perf.js');
-window.logViewerApp = jsContext('./logviewer.js');
 window.SERVICE_DOMAIN = process.env.SERVICE_DOMAIN || '';
 jsContext('./values.js');
 jsContext('./providers.js');
diff --git a/ui/entry-logviewer.js b/ui/entry-logviewer.js
index 1a7675f79..37ae0f1e6 100644
--- a/ui/entry-logviewer.js
+++ b/ui/entry-logviewer.js
@@ -16,6 +16,9 @@ require('angular-local-storage');
 require('bootstrap/dist/js/bootstrap');
 require('./vendor/resizer.js');
 
+// Bootstrap the Angular modules against which everything will be registered
+require('./js/logviewer.js');
+
 // Logviewer JS
 require('./js/providers.js');
 require('./js/values.js');
diff --git a/ui/js/controllers/logviewer.js b/ui/js/controllers/logviewer.js
index 2f693397d..e994971a5 100644
--- a/ui/js/controllers/logviewer.js
+++ b/ui/js/controllers/logviewer.js
@@ -1,3 +1,5 @@
+import logViewerApp from '../logviewer';
+
 logViewerApp.controller('LogviewerCtrl', [
     '$location', '$window', '$document', '$rootScope', '$scope',
     '$timeout', 'ThTextLogStepModel', 'ThJobDetailModel',
diff --git a/ui/js/logviewer.js b/ui/js/logviewer.js
index 44e1ed0b8..4bf5462da 100644
--- a/ui/js/logviewer.js
+++ b/ui/js/logviewer.js
@@ -1,4 +1,4 @@
-var logViewerApp = angular.module('logviewer', ['treeherder']);
+const logViewerApp = angular.module('logviewer', ['treeherder']);
 
 logViewerApp.config(['$compileProvider', '$locationProvider', '$resourceProvider',
     function ($compileProvider, $locationProvider, $resourceProvider) {
@@ -16,4 +16,4 @@ logViewerApp.config(['$compileProvider', '$locationProvider', '$resourceProvider
         $resourceProvider.defaults.cancellable = true;
     }]).run(require('./cache-templates'));
 
-module.exports = logViewerApp;
+export default logViewerApp;