diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index 9cc036908..0131f8024 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -127,6 +127,8 @@ describe('Apps', function () {
     };
 
     before(function (done) {
+        config._reset();
+
         config.setFqdn(DOMAIN_0.domain);
 
         async.series([
diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index d056e9c5e..16760b216 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -80,6 +80,7 @@ var awsHostedZones;
 
 describe('apptask', function () {
     before(function (done) {
+        config._reset();
         config.set('version', '0.5.0');
         config.setFqdn(DOMAIN_0.domain);
         config.set('provider', 'caas');
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 83b485155..cd0f0fc84 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -69,6 +69,7 @@ const TEST_DOMAIN = {
 
 describe('database', function () {
     before(function (done) {
+        config._reset();
         config.setFqdn(TEST_DOMAIN.domain);
 
         async.series([
@@ -1425,6 +1426,9 @@ describe('database', function () {
 
     describe('groups', function () {
         before(function (done) {
+            config._reset();
+            config.setFqdn(TEST_DOMAIN.domain);
+
             async.series([
                 database.initialize,
                 database._clear,
@@ -1545,6 +1549,7 @@ describe('database', function () {
 
     describe('importFromFile', function () {
         before(function (done) {
+            config._reset();
             config.setFqdn(TEST_DOMAIN.domain);
 
             async.series([
@@ -1578,6 +1583,7 @@ describe('database', function () {
 
     describe('mailboxes', function () {
         before(function (done) {
+            config._reset();
             config.setFqdn(TEST_DOMAIN.domain);
 
             async.series([
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index b3737bb16..60dde96b0 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -82,6 +82,9 @@ function startDockerProxy(interceptor, callback) {
 }
 
 function setup(done) {
+    config._reset();
+    config.set('fqdn', 'example.com');
+
     async.series([
         database.initialize.bind(null),
         database._clear.bind(null),
diff --git a/src/test/settings-test.js b/src/test/settings-test.js
index a6b3b4c7a..5967f3c80 100644
--- a/src/test/settings-test.js
+++ b/src/test/settings-test.js
@@ -19,6 +19,8 @@ var async = require('async'),
     settingsdb = require('../settingsdb.js');
 
 function setup(done) {
+    config._reset();
+    config.set('fqdn', 'example.com');
     config.set('provider', 'caas');
     nock.cleanAll();
 
diff --git a/src/test/user-test.js b/src/test/user-test.js
index 993556851..a7f7a3b2f 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -68,6 +68,7 @@ function createOwner(done) {
 }
 
 function setup(done) {
+    config._reset();
     config.setFqdn(DOMAIN_0.domain);
 
     async.series([