diff --git a/tests/acceptance/api-token-test.js b/tests/acceptance/api-token-test.js
index 9a571fec206..c9f35c67129 100644
--- a/tests/acceptance/api-token-test.js
+++ b/tests/acceptance/api-token-test.js
@@ -9,24 +9,24 @@ import { setupApplicationTest } from 'crates-io/tests/helpers';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | api-tokens', function (hooks) {
-  setupApplicationTest(hooks);
+  setupApplicationTest(hooks, { msw: true });
 
   function prepare(context) {
-    let user = context.server.create('user', {
+    let user = context.db.user.create({
       login: 'johnnydee',
       name: 'John Doe',
       email: 'john@doe.com',
       avatar: 'https://avatars2.githubusercontent.com/u/1234567?v=4',
     });
 
-    context.server.create('api-token', {
+    context.db.apiToken.create({
       user,
       name: 'foo',
       createdAt: '2017-08-01T12:34:56',
       lastUsedAt: '2017-11-02T01:45:14',
     });
 
-    context.server.create('api-token', {
+    context.db.apiToken.create({
       user,
       name: 'BAR',
       createdAt: '2017-11-19T17:59:22',
@@ -34,7 +34,7 @@ module('Acceptance | api-tokens', function (hooks) {
       expiredAt: '2017-12-19T17:59:22',
     });
 
-    context.server.create('api-token', {
+    context.db.apiToken.create({
       user,
       name: 'recently expired',
       createdAt: '2017-08-01T12:34:56',
diff --git a/tests/acceptance/front-page-test.js b/tests/acceptance/front-page-test.js
index bb0f73d28ee..4bf71591dd2 100644
--- a/tests/acceptance/front-page-test.js
+++ b/tests/acceptance/front-page-test.js
@@ -13,12 +13,13 @@ import { summary } from '../../mirage/route-handlers/summary';
 import axeConfig from '../axe-config';
 
 module('Acceptance | front page', function (hooks) {
-  setupApplicationTest(hooks);
+  setupApplicationTest(hooks, { msw: true });
 
   test('visiting /', async function (assert) {
     this.owner.lookup('service:intl').locale = 'en';
 
-    this.server.loadFixtures();
+    this.db.user.create({ name: 'SimonSays' });
+    // this.server.loadFixtures();
 
     await visit('/');
 
diff --git a/tests/acceptance/readme-rendering-test.js b/tests/acceptance/readme-rendering-test.js
index 946cd792671..de581793d87 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);
+  setupApplicationTest(hooks, { msw: true });
 
   test('it works', async function (assert) {
     let crate = this.server.create('crate', { name: 'serde' });