diff --git a/app/controllers/crate/settings/new-trusted-publisher.js b/app/controllers/crate/settings/new-trusted-publisher.js
index f236f6f0443..5c25af0346a 100644
--- a/app/controllers/crate/settings/new-trusted-publisher.js
+++ b/app/controllers/crate/settings/new-trusted-publisher.js
@@ -2,8 +2,8 @@ import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import Ember from 'ember';
 
+import { isTesting } from '@embroider/macros';
 import { rawTimeout, restartableTask, task } from 'ember-concurrency';
 
 export default class NewTrustedPublisherController extends Controller {
@@ -41,7 +41,7 @@ export default class NewTrustedPublisherController extends Controller {
   }
 
   verifyWorkflowTask = restartableTask(async () => {
-    let timeout = Ember.testing ? 0 : 500;
+    let timeout = isTesting() ? 0 : 500;
     await rawTimeout(timeout);
 
     let { verificationUrl } = this;
diff --git a/app/controllers/settings/email-notifications.js b/app/controllers/settings/email-notifications.js
index c670e32ae15..16c67dac5fc 100644
--- a/app/controllers/settings/email-notifications.js
+++ b/app/controllers/settings/email-notifications.js
@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
-import Ember from 'ember';
 
+import { isTesting } from '@embroider/macros';
 import { alias } from 'macro-decorators';
 
 import ajax from '../../utils/ajax';
@@ -15,7 +15,7 @@ export default class EmailNotificationsSettingsController extends Controller {
   emailNotificationsSuccess = false;
 
   get hasEmailNotificationFeature() {
-    return Ember.testing;
+    return isTesting();
   }
 
   setAllEmailNotifications(value) {
diff --git a/app/routes/application.js b/app/routes/application.js
index 6cfcf6f2466..5cd04f00e99 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -1,8 +1,8 @@
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
-import Ember from 'ember';
 
+import { isTesting } from '@embroider/macros';
 import { didCancel, dropTask, rawTimeout, task } from 'ember-concurrency';
 
 import ajax from '../utils/ajax';
@@ -61,7 +61,7 @@ export default class ApplicationRoute extends Route {
 
   checkReadOnlyStatusTask = dropTask(async () => {
     // delay the status check to let the more relevant data load first
-    let timeout = Ember.testing ? 0 : 1000;
+    let timeout = isTesting() ? 0 : 1000;
     await rawTimeout(timeout);
 
     let { read_only, banner_message } = await ajax('/api/v1/site_metadata');
diff --git a/app/services/progress.js b/app/services/progress.js
index 01c2ba9c5d2..9d647da5531 100644
--- a/app/services/progress.js
+++ b/app/services/progress.js
@@ -1,8 +1,8 @@
 import Service, { service } from '@ember/service';
 import { htmlSafe } from '@ember/template';
 import { tracked } from '@glimmer/tracking';
-import Ember from 'ember';
 
+import { isTesting } from '@embroider/macros';
 import { didCancel, dropTask, rawTimeout, task } from 'ember-concurrency';
 
 const SPEED = 200;
@@ -36,7 +36,7 @@ export default class ProgressService extends Service {
   });
 
   updateTask = dropTask(async () => {
-    if (Ember.testing) return;
+    if (isTesting()) return;
 
     let progress = 0;
     this._style = `width: 0%`;