--- a/storage/.eslintrc.js
+++ b/storage/.eslintrc.js
@@ -1,7 +1,11 @@
 "use strict";
 
 module.exports = {
   "extends": [
     "../toolkit/.eslintrc.js"
-  ]
+  ],
+
+  rules: {
+    "no-undef": "error"
+  }
 };

new file mode 100644
--- /dev/null
+++ b/storage/test/unit/.eslintrc.js
@@ -0,0 +1,7 @@
+"use strict";
+
+module.exports = {
+  "extends": [
+    "../../../testing/xpcshell/xpcshell.eslintrc.js"
+  ]
+};

--- a/storage/test/unit/test_statement_executeAsync.js
+++ b/storage/test/unit/test_statement_executeAsync.js
@@ -2,16 +2,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * This file tests the functionality of mozIStorageBaseStatement::executeAsync
  * for both mozIStorageStatement and mozIStorageAsyncStatement.
  */
 
+// This file uses the internal _quit from testing/xpcshell/head.js */
+/* global _quit */
+
 const INTEGER = 1;
 const TEXT = "this is test text";
 const REAL = 3.23;
 const BLOB = [1, 2];
 
 /**
  * Execute the given statement asynchronously, spinning an event loop until the
  * async statement completes.