diff --git a/src/test/user-test.js b/src/test/user-test.js
index 043632da5..41df1727a 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -14,13 +14,13 @@ var async = require('async'),
     fs = require('fs'),
     groupdb = require('../groupdb.js'),
     groups = require('../groups.js'),
+    domains = require('../domains.js'),
     mail = require('../mail.js'),
-    maildb = require('../maildb.js'),
     mailboxdb = require('../mailboxdb.js'),
+    maildb = require('../maildb.js'),
     mailer = require('../mailer.js'),
     user = require('../user.js'),
     userdb = require('../userdb.js'),
-    settingsdb = require('../settingsdb.js'),
     UserError = user.UserError;
 
 var USERNAME = 'noBody';
@@ -43,7 +43,9 @@ var DISPLAY_NAME_1 = 'Second User';
 const DOMAIN_0 = {
     domain: 'example.com',
     zoneName: 'example.com',
-    config: { provider: 'manual' }
+    provider: 'manual',
+    config: {},
+    fallbackCertificate: null
 };
 
 function cleanupUsers(done) {
@@ -75,6 +77,8 @@ function setup(done) {
     async.series([
         database.initialize,
         database._clear,
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        mail.add.bind(null, DOMAIN_0.domain),
         mailer._clearMailQueue
     ], done);
 }
@@ -217,14 +221,6 @@ describe('User', function () {
             });
         });
 
-        it('did create mailbox', function (done) {
-            mailboxdb.getMailbox(USERNAME.toLowerCase(), DOMAIN_0.domain, function (error, mailbox) {
-                expect(error).to.be(null);
-                expect(mailbox.ownerType).to.be(mailboxdb.TYPE_USER);
-                done();
-            });
-        });
-
         it('fails because of invalid BAD_FIELD', function (done) {
             expect(function () {
                 user.create(EMAIL, {}, function () {});