diff --git a/migrations/20191115053638-appdb-add-mailboxDomain.js b/migrations/20191115053638-appdb-add-mailboxDomain.js
index 6ba674a3a..24b6727df 100644
--- a/migrations/20191115053638-appdb-add-mailboxDomain.js
+++ b/migrations/20191115053638-appdb-add-mailboxDomain.js
@@ -14,7 +14,6 @@ exports.up = function(db, callback) {
                 }, done);
             });
         },
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY COLUMN mailboxDomain VARCHAR(128) NOT NULL'),
         db.runSql.bind(db, 'ALTER TABLE apps ADD CONSTRAINT apps_mailDomain_constraint FOREIGN KEY(mailboxDomain) REFERENCES domains(domain)'),
     ], callback);
 };
diff --git a/migrations/schema.sql b/migrations/schema.sql
index b5c2f66d0..af4dfe0ce 100644
--- a/migrations/schema.sql
+++ b/migrations/schema.sql
@@ -85,7 +85,7 @@ CREATE TABLE IF NOT EXISTS apps(
     enableBackup BOOLEAN DEFAULT 1, // misnomer: controls automatic daily backups
     enableAutomaticUpdate BOOLEAN DEFAULT 1,
     mailboxName VARCHAR(128), // mailbox of this app. default allocated as '.app'
-    mailboxDomain VARCHAR(128) NOT NULL, // mailbox domain of this apps
+    mailboxDomain VARCHAR(128), // mailbox domain of this apps
     label VARCHAR(128),     // display name
     tagsJson VARCHAR(2048), // array of tags
     dataDir VARCHAR(256) UNIQUE,
diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index 834674de4..99bb9858b 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -215,10 +215,10 @@ describe('apptask', function () {
         });
     });
 
-    it('barfs on bad manifest', function (done) {
+    it('fails on bad manifest', function (done) {
         var badApp = _.extend({ }, APP);
         badApp.manifest = _.extend({ }, APP.manifest);
-        delete badApp.manifest.id;
+        delete badApp.manifest.httpPort;
 
         apptask._verifyManifest(badApp.manifest, function (error) {
             expect(error).to.be.ok();
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 52fe65cd4..5bff266f9 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -75,7 +75,8 @@ var APP_0 = {
     health: null,
     accessRestriction: null,
     memoryLimit: 4294967296,
-    mailboxName: 'some-location-0.app'
+    mailboxName: 'some-location-0.app',
+    mailboxDomain: DOMAIN_0.domain
 };
 
 function setup(done) {