diff --git a/src/test/common.js b/src/test/common.js
index fcf334b73..b7ccf7cc2 100644
--- a/src/test/common.js
+++ b/src/test/common.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const apps = require('../apps.js'),
-    async = require('async'),
     constants = require('../constants.js'),
     database = require('../database.js'),
     delay = require('../delay.js'),
@@ -11,6 +10,7 @@ const apps = require('../apps.js'),
     mailer = require('../mailer.js'),
     nock = require('nock'),
     path = require('path'),
+    paths = require('../paths.js'),
     settings = require('../settings.js'),
     tasks = require('../tasks.js'),
     users = require('../users.js');
@@ -173,22 +173,16 @@ async function domainSetup() {
     await domains.add(domain.domain, domain, auditSource);
 }
 
-function setup(done) {
-    async.series([
-        domainSetup,
-        async function createOwner() {
-            const result = await users.createOwner(admin.email, admin.username, admin.password, admin.displayName, auditSource);
-            admin.id = result;
-        },
-        apps.add.bind(null, app.id, app.appStoreId, app.manifest, app.subdomain, app.domain, app.portBindings, app),
-        settings._set.bind(null, settings.APPSTORE_API_TOKEN_KEY, exports.appstoreToken), // appstore token
-        async function createUser() {
-            const result = await users.add(user.email, user, auditSource);
-            user.id = result;
-        },
-
-        tasks.stopAllTasks,
-    ], done);
+async function setup() {
+    await fs.promises.rm(paths.DISK_USAGE_FILE, { force: true });
+    await domainSetup();
+    const ownerId = await users.createOwner(admin.email, admin.username, admin.password, admin.displayName, auditSource);
+    admin.id = ownerId;
+    await apps.add(app.id, app.appStoreId, app.manifest, app.subdomain, app.domain, app.portBindings, app);
+    await settings._set(settings.APPSTORE_API_TOKEN_KEY, exports.appstoreToken); // appstore token
+    const userId = await users.add(user.email, user, auditSource);
+    user.id = userId;
+    await tasks.stopAllTasks();
 }
 
 async function cleanup() {