diff --git a/tests/acceptance/404-test.js b/tests/acceptance/404-test.js
index c57f72e5ed9..cc612721d6a 100644
--- a/tests/acceptance/404-test.js
+++ b/tests/acceptance/404-test.js
@@ -6,7 +6,7 @@ import percySnapshot from '@percy/ember';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | 404', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('/unknown-route shows a 404 page', async function (assert) {
     await visit('/unknown-route');
diff --git a/tests/acceptance/api-token-test.js b/tests/acceptance/api-token-test.js
index 1c18fcac5ac..891b86172ba 100644
--- a/tests/acceptance/api-token-test.js
+++ b/tests/acceptance/api-token-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | api-tokens', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let user = context.db.user.create({
diff --git a/tests/acceptance/categories-test.js b/tests/acceptance/categories-test.js
index aa909073e3b..eb53d30d54e 100644
--- a/tests/acceptance/categories-test.js
+++ b/tests/acceptance/categories-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../axe-config';
 
 module('Acceptance | categories', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('listing categories', async function (assert) {
     this.owner.lookup('service:intl').locale = 'en';
diff --git a/tests/acceptance/crate-deletion-test.js b/tests/acceptance/crate-deletion-test.js
index 22356f80dba..3fb82c2af4c 100644
--- a/tests/acceptance/crate-deletion-test.js
+++ b/tests/acceptance/crate-deletion-test.js
@@ -6,7 +6,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | crate deletion', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('happy path', async function (assert) {
     let user = this.db.user.create();
diff --git a/tests/acceptance/crate-dependencies-test.js b/tests/acceptance/crate-dependencies-test.js
index a34139ab132..a9ac5227f03 100644
--- a/tests/acceptance/crate-dependencies-test.js
+++ b/tests/acceptance/crate-dependencies-test.js
@@ -13,7 +13,7 @@ import axeConfig from '../axe-config';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | crate dependencies page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('shows the lists of dependencies', async function (assert) {
     loadFixtures(this.db);
diff --git a/tests/acceptance/crate-following-test.js b/tests/acceptance/crate-following-test.js
index 9145f062706..0583551b232 100644
--- a/tests/acceptance/crate-following-test.js
+++ b/tests/acceptance/crate-following-test.js
@@ -8,7 +8,7 @@ import { http, HttpResponse } from 'msw';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | Crate following', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context, { loggedIn = true, following = false } = {}) {
     let { db } = context;
diff --git a/tests/acceptance/crate-navtabs-test.js b/tests/acceptance/crate-navtabs-test.js
index cd68834dab4..f3f2e9fb545 100644
--- a/tests/acceptance/crate-navtabs-test.js
+++ b/tests/acceptance/crate-navtabs-test.js
@@ -10,7 +10,7 @@ const TAB_REV_DEPS = '[data-test-rev-deps-tab] a';
 const TAB_SETTINGS = '[data-test-settings-tab] a';
 
 module('Acceptance | crate navigation tabs', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('basic navigation between tabs works as expected', async function (assert) {
     let crate = this.db.crate.create({ name: 'nanomsg' });
diff --git a/tests/acceptance/crate-test.js b/tests/acceptance/crate-test.js
index d3e03704ba9..7cba451bec6 100644
--- a/tests/acceptance/crate-test.js
+++ b/tests/acceptance/crate-test.js
@@ -13,7 +13,7 @@ import axeConfig from '../axe-config';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | crate page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('visiting a crate page from the front page', async function (assert) {
     let crate = this.db.crate.create({ name: 'nanomsg', newest_version: '0.6.1' });
diff --git a/tests/acceptance/crates-test.js b/tests/acceptance/crates-test.js
index 5c8c01dd1b7..71ce1a36bc2 100644
--- a/tests/acceptance/crates-test.js
+++ b/tests/acceptance/crates-test.js
@@ -13,7 +13,7 @@ import axeConfig from '../axe-config';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | crates page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   // should match the default set in the crates controller
   const per_page = 50;
diff --git a/tests/acceptance/dashboard-test.js b/tests/acceptance/dashboard-test.js
index 0bda0593957..a905cd16985 100644
--- a/tests/acceptance/dashboard-test.js
+++ b/tests/acceptance/dashboard-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | Dashboard', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('shows "page requires authentication" error when not logged in', async function (assert) {
     await visit('/dashboard');
diff --git a/tests/acceptance/dev-mode-test.js b/tests/acceptance/dev-mode-test.js
index 3072244247a..d9c1de81150 100644
--- a/tests/acceptance/dev-mode-test.js
+++ b/tests/acceptance/dev-mode-test.js
@@ -11,7 +11,7 @@ if (s.has('devmode')) {
    * @link http://localhost:4200/tests/?notrycatch&devmode&filter=Development%20Mode
    */
   module('Development Mode', function (hooks) {
-    setupApplicationTest(hooks, { msw: true });
+    setupApplicationTest(hooks);
 
     test('authenticated', async function () {
       let user = this.db.user.create();
diff --git a/tests/acceptance/email-change-test.js b/tests/acceptance/email-change-test.js
index 40d39b255ac..285b35ecc41 100644
--- a/tests/acceptance/email-change-test.js
+++ b/tests/acceptance/email-change-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | Email Change', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('happy path', async function (assert) {
     let user = this.db.user.create({ email: 'old@email.com' });
diff --git a/tests/acceptance/email-confirmation-test.js b/tests/acceptance/email-confirmation-test.js
index ca3bd25851f..00a6f386a64 100644
--- a/tests/acceptance/email-confirmation-test.js
+++ b/tests/acceptance/email-confirmation-test.js
@@ -6,7 +6,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | Email Confirmation', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('unauthenticated happy path', async function (assert) {
     let user = this.db.user.create({ emailVerificationToken: 'badc0ffee' });
diff --git a/tests/acceptance/front-page-test.js b/tests/acceptance/front-page-test.js
index 864f91b2e0b..8bf42d6a74e 100644
--- a/tests/acceptance/front-page-test.js
+++ b/tests/acceptance/front-page-test.js
@@ -14,7 +14,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../axe-config';
 
 module('Acceptance | front page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('visiting /', async function (assert) {
     this.owner.lookup('service:intl').locale = 'en';
diff --git a/tests/acceptance/invites-test.js b/tests/acceptance/invites-test.js
index f85c0cbef34..b3cff7cf93c 100644
--- a/tests/acceptance/invites-test.js
+++ b/tests/acceptance/invites-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | /me/pending-invites', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let inviter = context.db.user.create({ name: 'janed' });
diff --git a/tests/acceptance/keyword-test.js b/tests/acceptance/keyword-test.js
index b5cd7246aa2..76579c4146b 100644
--- a/tests/acceptance/keyword-test.js
+++ b/tests/acceptance/keyword-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../axe-config';
 
 module('Acceptance | keywords', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('keyword/:keyword_id index default sort is recent-downloads', async function (assert) {
     this.db.keyword.create({ keyword: 'network' });
diff --git a/tests/acceptance/login-test.js b/tests/acceptance/login-test.js
index 7d000efe358..63dce17ddf9 100644
--- a/tests/acceptance/login-test.js
+++ b/tests/acceptance/login-test.js
@@ -10,7 +10,7 @@ import { http, HttpResponse } from 'msw';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | Login', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
   setupWindowMock(hooks);
 
   test('successful login', async function (assert) {
diff --git a/tests/acceptance/logout-test.js b/tests/acceptance/logout-test.js
index b40a8dbb64a..b38ac1662f7 100644
--- a/tests/acceptance/logout-test.js
+++ b/tests/acceptance/logout-test.js
@@ -7,7 +7,7 @@ import { setupWindowMock } from 'ember-window-mock/test-support';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | Logout', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
   setupWindowMock(hooks);
 
   test('successful logout', async function (assert) {
diff --git a/tests/acceptance/publish-notifications-test.js b/tests/acceptance/publish-notifications-test.js
index 129680b5588..383a1237478 100644
--- a/tests/acceptance/publish-notifications-test.js
+++ b/tests/acceptance/publish-notifications-test.js
@@ -8,7 +8,7 @@ import { http, HttpResponse } from 'msw';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | publish notifications', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('unsubscribe and resubscribe', async function (assert) {
     let user = this.db.user.create();
diff --git a/tests/acceptance/read-only-mode-test.js b/tests/acceptance/read-only-mode-test.js
index 25a97861e58..bca05656beb 100644
--- a/tests/acceptance/read-only-mode-test.js
+++ b/tests/acceptance/read-only-mode-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { AjaxError } from '../../utils/ajax';
 
 module('Acceptance | Read-only Mode', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('notification is not shown for read-write mode', async function (assert) {
     await visit('/');
diff --git a/tests/acceptance/readme-rendering-test.js b/tests/acceptance/readme-rendering-test.js
index db6d8cb48ce..a8d9de3453f 100644
--- a/tests/acceptance/readme-rendering-test.js
+++ b/tests/acceptance/readme-rendering-test.js
@@ -92,7 +92,7 @@ graph TD;
 `;
 
 module('Acceptance | README rendering', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('it works', async function (assert) {
     let crate = this.db.crate.create({ name: 'serde' });
diff --git a/tests/acceptance/reverse-dependencies-test.js b/tests/acceptance/reverse-dependencies-test.js
index e6c746d0a76..35fe916f185 100644
--- a/tests/acceptance/reverse-dependencies-test.js
+++ b/tests/acceptance/reverse-dependencies-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | /crates/:crate_id/reverse_dependencies', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare({ db }) {
     let foo = db.crate.create({ name: 'foo' });
diff --git a/tests/acceptance/search-test.js b/tests/acceptance/search-test.js
index d1ed6bf7389..80e655286f0 100644
--- a/tests/acceptance/search-test.js
+++ b/tests/acceptance/search-test.js
@@ -15,7 +15,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../axe-config';
 
 module('Acceptance | search', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('searching for "rust"', async function (assert) {
     loadFixtures(this.db);
diff --git a/tests/acceptance/settings/add-owner-test.js b/tests/acceptance/settings/add-owner-test.js
index 50ae4130701..d1cc9051707 100644
--- a/tests/acceptance/settings/add-owner-test.js
+++ b/tests/acceptance/settings/add-owner-test.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | Settings | Add Owner', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let { db } = context;
diff --git a/tests/acceptance/settings/remove-owner-test.js b/tests/acceptance/settings/remove-owner-test.js
index 5bcb55973ed..eb94920f01f 100644
--- a/tests/acceptance/settings/remove-owner-test.js
+++ b/tests/acceptance/settings/remove-owner-test.js
@@ -6,7 +6,7 @@ import { http, HttpResponse } from 'msw';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | Settings | Remove Owner', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let { db } = context;
diff --git a/tests/acceptance/settings/settings-test.js b/tests/acceptance/settings/settings-test.js
index ba5d3bcade0..cd35b7c150a 100644
--- a/tests/acceptance/settings/settings-test.js
+++ b/tests/acceptance/settings/settings-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../../axe-config';
 
 module('Acceptance | Settings', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let { db } = context;
diff --git a/tests/acceptance/sudo-test.js b/tests/acceptance/sudo-test.js
index 274fc7ae412..1da8d75fc67 100644
--- a/tests/acceptance/sudo-test.js
+++ b/tests/acceptance/sudo-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | sudo', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context, isAdmin) {
     const user = context.db.user.create({
diff --git a/tests/acceptance/support-test.js b/tests/acceptance/support-test.js
index 22a7f092204..f3d19bb0a69 100644
--- a/tests/acceptance/support-test.js
+++ b/tests/acceptance/support-test.js
@@ -12,7 +12,7 @@ import axeConfig from '../axe-config';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | support', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('shows an inquire list', async function (assert) {
     await visit('/support');
diff --git a/tests/acceptance/team-page-test.js b/tests/acceptance/team-page-test.js
index 8196acfbc9d..619baea78cf 100644
--- a/tests/acceptance/team-page-test.js
+++ b/tests/acceptance/team-page-test.js
@@ -10,7 +10,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../axe-config';
 
 module('Acceptance | team page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('has team organization display', async function (assert) {
     loadFixtures(this.db);
diff --git a/tests/acceptance/token-invites-test.js b/tests/acceptance/token-invites-test.js
index 9fdbe574ebc..8ef9cdc2429 100644
--- a/tests/acceptance/token-invites-test.js
+++ b/tests/acceptance/token-invites-test.js
@@ -9,7 +9,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | /accept-invite/:token', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('visiting to /accept-invite shows 404 page', async function (assert) {
     await visit('/accept-invite');
diff --git a/tests/acceptance/user-page-test.js b/tests/acceptance/user-page-test.js
index 63f955af181..a924c311979 100644
--- a/tests/acceptance/user-page-test.js
+++ b/tests/acceptance/user-page-test.js
@@ -10,7 +10,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import axeConfig from '../axe-config';
 
 module('Acceptance | user page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('has user display', async function (assert) {
     loadFixtures(this.db);
diff --git a/tests/acceptance/versions-test.js b/tests/acceptance/versions-test.js
index d29fd50ae6a..3952295d936 100644
--- a/tests/acceptance/versions-test.js
+++ b/tests/acceptance/versions-test.js
@@ -6,7 +6,7 @@ import percySnapshot from '@percy/ember';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Acceptance | crate versions page', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('show versions sorted by date', async function (assert) {
     let crate = this.db.crate.create({ name: 'nanomsg' });
diff --git a/tests/bugs/2329-test.js b/tests/bugs/2329-test.js
index 5c7869796bd..a0f9ab84fe5 100644
--- a/tests/bugs/2329-test.js
+++ b/tests/bugs/2329-test.js
@@ -10,7 +10,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Bug #2329', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
   setupWindowMock(hooks);
 
   test('is fixed', async function (assert) {
diff --git a/tests/bugs/4506-test.js b/tests/bugs/4506-test.js
index 9f3734cc775..8264979ef80 100644
--- a/tests/bugs/4506-test.js
+++ b/tests/bugs/4506-test.js
@@ -6,7 +6,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Bug #4506', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let { db } = context;
diff --git a/tests/helpers/index.js b/tests/helpers/index.js
index c9e14ebba6a..7ba4b90105a 100644
--- a/tests/helpers/index.js
+++ b/tests/helpers/index.js
@@ -7,14 +7,9 @@ export { setupTest, setupRenderingTest } from 'ember-qunit';
 
 // see http://emberjs.github.io/rfcs/0637-customizable-test-setups.html
 export function setupApplicationTest(hooks, options = {}) {
-  let { msw } = options;
-
   upstreamSetupApplicationTest(hooks, options);
 
-  if (msw) {
-    setupMSW(hooks);
-  }
-
+  setupMSW(hooks);
   setupSentryMock(hooks);
   setupAppTestDataAttr(hooks);
 }
diff --git a/tests/routes/category-test.js b/tests/routes/category-test.js
index e2ce3b9f65b..4339db3392f 100644
--- a/tests/routes/category-test.js
+++ b/tests/routes/category-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | category', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test("shows an error message if the category can't be found", async function (assert) {
     await visit('/categories/foo');
diff --git a/tests/routes/crate/delete-test.js b/tests/routes/crate/delete-test.js
index d6a80481bba..ecab91686f1 100644
--- a/tests/routes/crate/delete-test.js
+++ b/tests/routes/crate/delete-test.js
@@ -11,7 +11,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../../helpers/visit-ignoring-abort';
 
 module('Route: crate.delete', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let user = context.db.user.create();
diff --git a/tests/routes/crate/range-test.js b/tests/routes/crate/range-test.js
index 8d0ab4933c8..26d2daa9009 100644
--- a/tests/routes/crate/range-test.js
+++ b/tests/routes/crate/range-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../../helpers/visit-ignoring-abort';
 
 module('Route | crate.range', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('happy path', async function (assert) {
     let crate = this.db.crate.create({ name: 'foo' });
diff --git a/tests/routes/crate/settings-test.js b/tests/routes/crate/settings-test.js
index ea55baf14b9..4147d45db9f 100644
--- a/tests/routes/crate/settings-test.js
+++ b/tests/routes/crate/settings-test.js
@@ -6,7 +6,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../../helpers/visit-ignoring-abort';
 
 module('Route | crate.settings', hooks => {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     const user = context.db.user.create();
diff --git a/tests/routes/crate/version/crate-links-test.js b/tests/routes/crate/version/crate-links-test.js
index 2d60dc92ea1..326039f8579 100644
--- a/tests/routes/crate/version/crate-links-test.js
+++ b/tests/routes/crate/version/crate-links-test.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Route | crate.version | crate links', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('shows all external crate links', async function (assert) {
     let crate = this.db.crate.create({
diff --git a/tests/routes/crate/version/docs-link-test.js b/tests/routes/crate/version/docs-link-test.js
index efa26feb8c8..20414341884 100644
--- a/tests/routes/crate/version/docs-link-test.js
+++ b/tests/routes/crate/version/docs-link-test.js
@@ -6,7 +6,7 @@ import { http, HttpResponse } from 'msw';
 import { setupApplicationTest } from 'crates-io/tests/helpers';
 
 module('Route | crate.version | docs link', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('shows regular documentation link', async function (assert) {
     let crate = this.db.crate.create({ name: 'foo', documentation: 'https://foo.io/docs' });
diff --git a/tests/routes/crate/version/model-test.js b/tests/routes/crate/version/model-test.js
index 078a3fdf769..a46c8451b2e 100644
--- a/tests/routes/crate/version/model-test.js
+++ b/tests/routes/crate/version/model-test.js
@@ -6,7 +6,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../../../helpers/visit-ignoring-abort';
 
 module('Route | crate.version | model() hook', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   module('with explicit version number in the URL', function () {
     test('shows yanked versions', async function (assert) {
diff --git a/tests/routes/keyword-test.js b/tests/routes/keyword-test.js
index 91af4afe55b..d0b22ee8ae5 100644
--- a/tests/routes/keyword-test.js
+++ b/tests/routes/keyword-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | keyword', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('shows an empty list if the keyword does not exist on the server', async function (assert) {
     await visit('/keywords/foo');
diff --git a/tests/routes/settings/tokens/index-test.js b/tests/routes/settings/tokens/index-test.js
index 042442a7d14..25d29c56a01 100644
--- a/tests/routes/settings/tokens/index-test.js
+++ b/tests/routes/settings/tokens/index-test.js
@@ -6,7 +6,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../../../helpers/visit-ignoring-abort';
 
 module('/settings/tokens', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let user = context.db.user.create({
diff --git a/tests/routes/settings/tokens/new-test.js b/tests/routes/settings/tokens/new-test.js
index f1126c0ac34..6f8efaa6179 100644
--- a/tests/routes/settings/tokens/new-test.js
+++ b/tests/routes/settings/tokens/new-test.js
@@ -10,7 +10,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../../../helpers/visit-ignoring-abort';
 
 module('/settings/tokens/new', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   function prepare(context) {
     let user = context.db.user.create({
diff --git a/tests/routes/support-test.js b/tests/routes/support-test.js
index 2b34317b8ee..dc930d32340 100644
--- a/tests/routes/support-test.js
+++ b/tests/routes/support-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | support', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test('should not retain query params when exiting and then returning', async function (assert) {
     await visit('/support?inquire=crate-violation');
diff --git a/tests/routes/team-test.js b/tests/routes/team-test.js
index 2837cce4eff..d02d9d89b62 100644
--- a/tests/routes/team-test.js
+++ b/tests/routes/team-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | team', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test("shows an error message if the user can't be found", async function (assert) {
     await visit('/teams/foo');
diff --git a/tests/routes/user-test.js b/tests/routes/user-test.js
index c7136a93646..cca156402e5 100644
--- a/tests/routes/user-test.js
+++ b/tests/routes/user-test.js
@@ -8,7 +8,7 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | user', function (hooks) {
-  setupApplicationTest(hooks, { msw: true });
+  setupApplicationTest(hooks);
 
   test("shows an error message if the user can't be found", async function (assert) {
     await visit('/users/foo');