diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 8c0174c0c86..c250c6f79e8 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -2,10 +2,11 @@ import Application from "@ember/application";
 import "./global-compat";
 import "./loader-shims";
 import require from "require";
+import { normalizeEmberEventHandling } from "discourse/lib/ember-events";
 import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections";
+import { withPluginApi } from "discourse/lib/plugin-api";
 import { isTesting } from "discourse-common/config/environment";
 import { buildResolver } from "discourse-common/resolver";
-import { normalizeEmberEventHandling } from "./lib/ember-events";
 
 const _pluginCallbacks = [];
 let _unhandledThemeErrors = [];
@@ -147,8 +148,6 @@ function loadInitializers(app) {
   }
 
   // Plugins that are registered via `<script>` tags.
-  const { withPluginApi } = require("discourse/lib/plugin-api");
-
   for (let [i, callback] of _pluginCallbacks.entries()) {
     app.instanceInitializer({
       name: `_discourse_plugin_${i}`,
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-listen-boot.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-listen-boot.js
index 65f629d8a02..e777a0b5fc2 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-listen-boot.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-listen-boot.js
@@ -1 +1,2 @@
+require("discourse-common/config/environment").setEnvironment("testing");
 require("discourse/tests/test-boot-ember-cli");
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-trigger-ember-cli-boot.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-trigger-ember-cli-boot.js
index 65f629d8a02..e777a0b5fc2 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-trigger-ember-cli-boot.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-trigger-ember-cli-boot.js
@@ -1 +1,2 @@
+require("discourse-common/config/environment").setEnvironment("testing");
 require("discourse/tests/test-boot-ember-cli");
diff --git a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
index a614dfb5d0f..c4f129b6560 100644
--- a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
+++ b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
@@ -4,11 +4,8 @@ import { start } from "ember-qunit";
 import * as QUnit from "qunit";
 import { setup } from "qunit-dom";
 import setupTests from "discourse/tests/setup-tests";
-import { setEnvironment } from "discourse-common/config/environment";
 import config from "../config/environment";
 
-setEnvironment("testing");
-
 document.addEventListener("discourse-booted", () => {
   // eslint-disable-next-line no-undef
   if (!EmberENV.TESTS_FILE_LOADED) {