diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 3416edbdff..e55edf45cc 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -164,10 +164,6 @@ var define, requirejs;
       "@ember/object/internals": {
         guidFor: Ember.guidFor,
       },
-      "@ember/test": {
-        registerWaiter: Ember.Test.registerWaiter,
-        unregisterWaiter: Ember.Test.unregisterWaiter,
-      },
       I18n: {
         // eslint-disable-next-line
         default: I18n,
diff --git a/app/assets/javascripts/test-shims.js b/app/assets/javascripts/test-shims.js
index 2aaf663525..37434a3132 100644
--- a/app/assets/javascripts/test-shims.js
+++ b/app/assets/javascripts/test-shims.js
@@ -26,6 +26,16 @@ define("htmlbars-inline-precompile", () => {
   };
 });
 
+define("@ember/test", () => {
+  // eslint-disable-next-line no-undef, discourse-ember/global-ember
+  const { registerWaiter, unregisterWaiter } = Ember.Test;
+
+  return {
+    registerWaiter,
+    unregisterWaiter,
+  };
+});
+
 let _app;
 define("@ember/test-helpers", () => {
   let helpers = {