diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index c2c3520a3bc..77598e47127 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,3 +1,5 @@
+// discourse-skip-module
+
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -42,6 +44,9 @@
 //
 //= require jquery.magnific-popup.min.js
 
+const buildResolver = require("discourse-common/resolver").buildResolver;
+window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
+
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -103,7 +108,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = []
+  server.handlers = [];
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {