diff --git a/services/web/.eslintrc b/services/web/.eslintrc
index 76b742a3f7..d24752eff9 100644
--- a/services/web/.eslintrc
+++ b/services/web/.eslintrc
@@ -19,15 +19,6 @@
     "browser": true,
     "mocha": true
   },
-  "globals": {
-    "expect": true,
-    "define": true,
-    "$": true,
-    "angular": true,
-    // Injected in layout.pug
-    "user_id": true,
-    "ace": true
-  },
   "settings": {
     // Tell eslint-plugin-react to detect which version of React we are using
     "react": {
@@ -59,7 +50,11 @@
   },
   "overrides": [
     {
+      // Test specific rules
       "files": ["**/test/*/src/**/*.js"],
+      "globals": {
+        "expect": true
+      },
       "rules": {
         // mocha-specific rules
         "mocha/handle-done-callback": "error",
@@ -82,11 +77,38 @@
       }
     },
     {
-      // don't allow console.log in backend code
+      // Frontend test specific rules
+      "files": ["**/test/unit_frontend/{src,es}/**/*.js"],
+      "globals": {
+        "expect": true,
+        "define": true,
+        "$": true
+      }
+    },
+    {
+      // Backend specific rules
       "files": ["**/app/*/src/**/*.js"],
       "rules": {
+        // don't allow console.log in backend code
         "no-console": "error"
       }
+    },
+    {
+      // Frontend specific rules
+      "files": ["**/public/{src,es}/**/*.js"],
+      "globals": {
+        "define": true,
+        "$": true,
+        "angular": true,
+        "_": true,
+        "ace": true,
+        "ga": true,
+        "AlgoliaSearch": true,
+        "sl_console": true,
+        "sl_debugging": true,
+        // Injected in layout.pug
+        "user_id": true
+      }
     }
   ]
 }
diff --git a/services/web/app/src/Features/Project/SafePath.js b/services/web/app/src/Features/Project/SafePath.js
index a78c5e4604..90fb75e538 100644
--- a/services/web/app/src/Features/Project/SafePath.js
+++ b/services/web/app/src/Features/Project/SafePath.js
@@ -128,8 +128,4 @@ prototype\
   })
 }
 
-if (typeof define !== 'undefined' && define !== null) {
-  define([], load)
-} else {
-  module.exports = load()
-}
+module.exports = load()
diff --git a/services/web/public/src/directives/mathjax.js b/services/web/public/src/directives/mathjax.js
index 96bbf4eab4..dadfc22f98 100644
--- a/services/web/public/src/directives/mathjax.js
+++ b/services/web/public/src/directives/mathjax.js
@@ -1,4 +1,4 @@
-/* global MathJax, _ */
+/* global MathJax */
 
 define(['base'], function(App) {
   return App.directive('mathjax', function($compile, $parse) {
diff --git a/services/web/public/src/ide/connection/ConnectionManager.js b/services/web/public/src/ide/connection/ConnectionManager.js
index 6aaf45d155..c8b57b954c 100644
--- a/services/web/public/src/ide/connection/ConnectionManager.js
+++ b/services/web/public/src/ide/connection/ConnectionManager.js
@@ -8,7 +8,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 
-/* global io sl_console sl_debugging */
+/* global io */
 
 define([], function() {
   let ConnectionManager
diff --git a/services/web/public/src/ide/editor/directives/aceEditor.js b/services/web/public/src/ide/editor/directives/aceEditor.js
index a98095dd69..d297396640 100644
--- a/services/web/public/src/ide/editor/directives/aceEditor.js
+++ b/services/web/public/src/ide/editor/directives/aceEditor.js
@@ -1,4 +1,3 @@
-/* global _ */
 /* eslint-disable
     camelcase,
     max-len
diff --git a/services/web/public/src/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.js b/services/web/public/src/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.js
index c89b186941..bad5203395 100644
--- a/services/web/public/src/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.js
+++ b/services/web/public/src/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.js
@@ -1,4 +1,3 @@
-/* global _ */
 define([
   'ide/editor/directives/aceEditor/auto-complete/CommandManager',
   'ide/editor/directives/aceEditor/auto-complete/EnvironmentManager',
diff --git a/services/web/public/src/ide/files/services/files.js b/services/web/public/src/ide/files/services/files.js
index 838aaa035e..dbc2573b7a 100644
--- a/services/web/public/src/ide/files/services/files.js
+++ b/services/web/public/src/ide/files/services/files.js
@@ -1,4 +1,3 @@
-/* global _ */
 define(['base'], App =>
   App.factory('files', function(ide) {
     const Files = {
diff --git a/services/web/public/src/main/new-subscription.js b/services/web/public/src/main/new-subscription.js
index 1bae170976..3e75b45419 100644
--- a/services/web/public/src/main/new-subscription.js
+++ b/services/web/public/src/main/new-subscription.js
@@ -3,7 +3,7 @@
     max-len,
     no-return-assign
 */
-/* global recurly,_,define */
+/* global recurly */
 define(['base', 'directives/creditCards'], App =>
   App.controller('NewSubscriptionController', function(
     $scope,
diff --git a/services/web/public/src/main/plans.js b/services/web/public/src/main/plans.js
index ac294eaa39..218945f442 100644
--- a/services/web/public/src/main/plans.js
+++ b/services/web/public/src/main/plans.js
@@ -2,7 +2,6 @@
     camelcase,
     max-len
 */
-/* global define,history */
 define(['base'], function(App) {
   App.factory('MultiCurrencyPricing', function() {
     const currencyCode = window.recomendedCurrency