diff --git a/src/routes/test/backups-test.js b/src/routes/test/backups-test.js
index 39f427747..8fcf895ba 100644
--- a/src/routes/test/backups-test.js
+++ b/src/routes/test/backups-test.js
@@ -25,7 +25,8 @@ const DOMAIN_0 = {
     zoneName: 'example-backups-test.com',
     config: {},
     provider: 'noop',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 var token = null;
@@ -37,7 +38,7 @@ function setup(done) {
     async.series([
         server.start,
         database._clear,
-        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
 
         function createAdmin(callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
diff --git a/src/routes/test/caas-test.js b/src/routes/test/caas-test.js
index 5a5bb2ea2..6065e41f0 100644
--- a/src/routes/test/caas-test.js
+++ b/src/routes/test/caas-test.js
@@ -31,7 +31,8 @@ const DOMAIN_0 = {
     zoneName: 'example-backups-test.com',
     config: {},
     provider: 'noop',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 var token = null;
@@ -57,7 +58,7 @@ function setup(done) {
         database._clear,
 
         settingsdb.set.bind(null, settings.CAAS_CONFIG_KEY, JSON.stringify({ boxId: 'BOX_ID', token: 'ACCESS_TOKEN2' })),
-        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
 
         function createAdmin(callback) {
             var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/BOX_ID/setup/verify?setupToken=somesetuptoken').reply(200, {});
diff --git a/src/routes/test/mail-test.js b/src/routes/test/mail-test.js
index 3472568ad..1f17b8ae0 100644
--- a/src/routes/test/mail-test.js
+++ b/src/routes/test/mail-test.js
@@ -23,7 +23,8 @@ const DOMAIN_0 = {
     zoneName: 'example-mail-test.com',
     config: {},
     provider: 'noop',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 const GROUP_NAME = 'maillistgroup';
@@ -39,7 +40,7 @@ function setup(done) {
     async.series([
         server.start.bind(null),
         database._clear.bind(null),
-        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
 
         function createAdmin(callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js
index 4f94e1075..150981db8 100644
--- a/src/routes/test/oauth2-test.js
+++ b/src/routes/test/oauth2-test.js
@@ -143,7 +143,8 @@ describe('OAuth2', function () {
             zoneName: 'example.com',
             config: {},
             provider: 'manual',
-            fallbackCertificate: null
+            fallbackCertificate: null,
+            tlsConfig: { provider: 'fallback' }
         };
 
         var USER_0 = {
@@ -310,7 +311,7 @@ describe('OAuth2', function () {
             async.series([
                 server.start,
                 database._clear,
-                domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+                domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
                 clientdb.add.bind(null, CLIENT_0.id, CLIENT_0.appId, CLIENT_0.type, CLIENT_0.clientSecret, CLIENT_0.redirectURI, CLIENT_0.scope),
                 clientdb.add.bind(null, CLIENT_1.id, CLIENT_1.appId, CLIENT_1.type, CLIENT_1.clientSecret, CLIENT_1.redirectURI, CLIENT_1.scope),
                 clientdb.add.bind(null, CLIENT_2.id, CLIENT_2.appId, CLIENT_2.type, CLIENT_2.clientSecret, CLIENT_2.redirectURI, CLIENT_2.scope),
diff --git a/src/routes/test/sysadmin-test.js b/src/routes/test/sysadmin-test.js
index 7e5b3250e..6c490c779 100644
--- a/src/routes/test/sysadmin-test.js
+++ b/src/routes/test/sysadmin-test.js
@@ -34,7 +34,8 @@ const DOMAIN_0 = {
     zoneName: 'example-sysadmin-test.com',
     config: {},
     provider: 'noop',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 function setup(done) {
@@ -45,7 +46,7 @@ function setup(done) {
     async.series([
         server.start,
         database._clear,
-        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
 
         function createAdmin(callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
diff --git a/src/routes/test/user-test.js b/src/routes/test/user-test.js
index 8e113c6cf..0db35acab 100644
--- a/src/routes/test/user-test.js
+++ b/src/routes/test/user-test.js
@@ -25,7 +25,8 @@ const DOMAIN_0 = {
     zoneName: 'example-user-test.com',
     config: {},
     provider: 'noop',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 const USERNAME_0 = 'superaDmIn', PASSWORD = 'Foobar?1337', EMAIL_0 = 'silLY@me.com', EMAIL_0_NEW = 'stupID@me.com', DISPLAY_NAME_0_NEW = 'New Name';
@@ -42,7 +43,7 @@ function setup(done) {
         server.start,
         database._clear,
         mailer._clearMailQueue,
-        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
         mail.add.bind(null, DOMAIN_0.domain)
     ], function (error) {
         expect(error).to.not.be.ok();
diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index 5cb5ca07a..30a237b58 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -74,14 +74,16 @@ describe('Apps', function () {
         domain: 'example.com',
         zoneName: 'example.com',
         provider: 'manual',
-        config: { }
+        config: { },
+        tlsConfig: { provider: 'fallback' }
     };
 
     const DOMAIN_1 = {
         domain: 'example2.com',
         zoneName: 'example2.com',
         provider: 'manual',
-        config: { }
+        config: { },
+        tlsConfig: { provider: 'fallback' }
     };
 
     var APP_0 = {
@@ -140,8 +142,8 @@ describe('Apps', function () {
         async.series([
             database.initialize,
             database._clear,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null),
-            domains.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, null),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig),
+            domains.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, null, DOMAIN_1.tlsConfig),
             userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
             userdb.add.bind(null, USER_0.id, USER_0),
             userdb.add.bind(null, USER_1.id, USER_1),
diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index 41b0e0406..0d847b8a3 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -57,7 +57,8 @@ const DOMAIN_0 = {
         accessKeyId: 'accessKeyId',
         secretAccessKey: 'secretAccessKey',
         endpoint: 'http://localhost:5353'
-    }
+    },
+    tlsConfig: { provider: 'fallback' }
 };
 
 var APP = {
@@ -104,7 +105,7 @@ describe('apptask', function () {
         async.series([
             database.initialize,
             database._clear,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig),
             appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.domain, APP.portBindings, APP),
             settings.initialize,
             settings.setTlsConfig.bind(null, { provider: 'caas' })
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 6f14a589a..38b239e64 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -68,21 +68,24 @@ const DOMAIN_0 = {
     domain: 'foobar.com',
     zoneName: 'foobar.com',
     provider: 'digitalocean',
-    config: { token: 'abcd' }
+    config: { token: 'abcd' },
+    tlsConfig: { provider: 'fallback' }
 };
 
 const DOMAIN_1 = {
     domain: 'foo.cloudron.io',
     zoneName: 'cloudron.io',
     provider: 'manual',
-    config: null
+    config: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 const TEST_DOMAIN = {
     domain: 'example.com',
     zoneName: 'example.com',
     provider: 'manual',
-    config: {}
+    config: {},
+    tlsConfig: { provider: 'fallback' }
 };
 
 describe('database', function () {
@@ -105,15 +108,15 @@ describe('database', function () {
 
     describe('domains', function () {
         it('can add domain', function (done) {
-            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
         });
 
         it('can add another domain', function (done) {
-            domaindb.add(DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config }, done);
+            domaindb.add(DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config, tlsConfig: DOMAIN_1.tlsConfig }, done);
         });
 
         it('cannot add same domain twice', function (done) {
-            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, function (error) {
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, function (error) {
                 expect(error).to.be.ok();
                 expect(error.reason).to.be(DatabaseError.ALREADY_EXISTS);
                 done();
@@ -134,8 +137,9 @@ describe('database', function () {
 
         it('can update domain', function (done) {
             const newConfig = { provider: 'manual' };
+            const newTlsConfig = { provider: 'foobar' };
 
-            domaindb.update(DOMAIN_1.domain, { provider: DOMAIN_1.provider, config: newConfig }, function (error) {
+            domaindb.update(DOMAIN_1.domain, { provider: DOMAIN_1.provider, config: newConfig, tlsConfig: newTlsConfig }, function (error) {
                 expect(error).to.equal(null);
 
                 domaindb.get(DOMAIN_1.domain, function (error, result) {
@@ -145,8 +149,10 @@ describe('database', function () {
                     expect(result.zoneName).to.equal(DOMAIN_1.zoneName);
                     expect(result.provider).to.equal(DOMAIN_1.provider);
                     expect(result.config).to.eql(newConfig);
+                    expect(result.tlsConfig).to.eql(newTlsConfig);
 
                     DOMAIN_1.config = newConfig;
+                    DOMAIN_1.tlsConfig = newTlsConfig;
 
                     done();
                 });
@@ -164,11 +170,13 @@ describe('database', function () {
                 expect(result[0].zoneName).to.equal(DOMAIN_1.zoneName);
                 expect(result[0].provider).to.equal(DOMAIN_1.provider);
                 expect(result[0].config).to.eql(DOMAIN_1.config);
+                expect(result[0].tlsConfig).to.eql(DOMAIN_1.tlsConfig);
 
                 expect(result[1].domain).to.equal(DOMAIN_0.domain);
                 expect(result[1].zoneName).to.equal(DOMAIN_0.zoneName);
                 expect(result[1].provider).to.equal(DOMAIN_0.provider);
                 expect(result[1].config).to.eql(DOMAIN_0.config);
+                expect(result[1].tlsConfig).to.eql(DOMAIN_0.tlsConfig);
 
                 done();
             });
@@ -744,7 +752,7 @@ describe('database', function () {
         };
 
         before(function (done) {
-            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
         });
 
         after(function (done) {
@@ -1585,7 +1593,7 @@ describe('database', function () {
 
     describe('mailboxes', function () {
         before(function (done) {
-            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
         });
 
         after(function (done) {
@@ -1751,7 +1759,7 @@ describe('database', function () {
         };
 
         before(function (done) {
-            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
         });
 
         after(function (done) {
diff --git a/src/test/digest-test.js b/src/test/digest-test.js
index e7f81cede..e927a0835 100644
--- a/src/test/digest-test.js
+++ b/src/test/digest-test.js
@@ -36,7 +36,8 @@ const DOMAIN_0 = {
     zoneName: 'example.com',
     config: {},
     provider: 'manual',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 var AUDIT_SOURCE = {
@@ -70,7 +71,7 @@ describe('digest', function () {
             database.initialize,
             database._clear,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             function (callback) {
diff --git a/src/test/dns-test.js b/src/test/dns-test.js
index 4ffb22eff..3bbaa81c9 100644
--- a/src/test/dns-test.js
+++ b/src/test/dns-test.js
@@ -22,7 +22,8 @@ var DOMAIN_0 = {
     zoneName: 'example-dns-test.com',
     provider: 'noop',
     config: {},
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 describe('dns provider', function () {
@@ -34,7 +35,7 @@ describe('dns provider', function () {
             database.initialize,
             settings.initialize,
             database._clear,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate)
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig)
         ], done);
     });
 
@@ -48,10 +49,9 @@ describe('dns provider', function () {
     describe('noop', function () {
         before(function (done) {
             DOMAIN_0.provider = 'noop';
-            DOMAIN_0.config = {
-            };
+            DOMAIN_0.config = {};
 
-            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
+            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
         });
 
         it('upsert succeeds', function (done) {
@@ -92,7 +92,7 @@ describe('dns provider', function () {
                 token: TOKEN
             };
 
-            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
+            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
         });
 
         it('upsert non-existing record succeeds', function (done) {
@@ -419,7 +419,7 @@ describe('dns provider', function () {
             AWS._originalRoute53 = AWS.Route53;
             AWS.Route53 = Route53Mock;
 
-            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
+            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
         });
 
         after(function () {
@@ -575,7 +575,7 @@ describe('dns provider', function () {
             _OriginalGCDNS = GCDNS.prototype.getZones;
             GCDNS.prototype.getZones = mockery(zoneQueue);
 
-            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
+            domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
         });
 
         after(function () {
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index f1f6e9851..bb575c636 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -27,7 +27,8 @@ const DOMAIN_0 = {
     zoneName: 'example.com',
     config: {},
     provider: 'manual',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 // owner
@@ -96,7 +97,7 @@ function setup(done) {
         database.initialize.bind(null),
         database._clear.bind(null),
         ldapServer.start.bind(null),
-        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
         maildb.add.bind(null, DOMAIN_0.domain),
         appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
         appdb.update.bind(null, APP_0.id, { containerId: APP_0.containerId }),
diff --git a/src/test/mail-test.js b/src/test/mail-test.js
index c51a4a3a2..caa62438f 100644
--- a/src/test/mail-test.js
+++ b/src/test/mail-test.js
@@ -18,7 +18,8 @@ const DOMAIN_0 = {
     zoneName: 'example.com',
     provider: 'manual',
     config: {},
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 function setup(done) {
@@ -29,7 +30,7 @@ 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),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
         mail.add.bind(null, DOMAIN_0.domain)
     ], done);
 }
diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js
index dbdd0c360..3142b6586 100644
--- a/src/test/updatechecker-test.js
+++ b/src/test/updatechecker-test.js
@@ -35,7 +35,8 @@ const DOMAIN_0 = {
     zoneName: 'example.com',
     config: {},
     provider: 'manual',
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 var AUDIT_SOURCE = {
@@ -74,7 +75,7 @@ describe('updatechecker - box - manual (email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settings.setAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER),
@@ -176,7 +177,7 @@ describe('updatechecker - box - automatic (no email)', function () {
         async.series([
             database.initialize,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
@@ -220,7 +221,7 @@ describe('updatechecker - box - automatic free (email)', function () {
         async.series([
             database.initialize,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
@@ -290,7 +291,7 @@ describe('updatechecker - app - manual (email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
@@ -406,7 +407,7 @@ describe('updatechecker - app - automatic (no email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
@@ -471,7 +472,7 @@ describe('updatechecker - app - automatic free (email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
-            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
             mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
diff --git a/src/test/user-test.js b/src/test/user-test.js
index 6dc972d70..1177eeb0c 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -44,7 +44,8 @@ const DOMAIN_0 = {
     zoneName: 'example.com',
     provider: 'manual',
     config: {},
-    fallbackCertificate: null
+    fallbackCertificate: null,
+    tlsConfig: { provider: 'fallback' }
 };
 
 function cleanupUsers(done) {
@@ -76,7 +77,7 @@ 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),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
         mail.add.bind(null, DOMAIN_0.domain),
         mailer._clearMailQueue
     ], done);