diff --git a/src/config.js b/src/config.js
index 4ecface81..cba4c9abf 100644
--- a/src/config.js
+++ b/src/config.js
@@ -116,9 +116,6 @@ function initConfig() {
     saveSync();
 }
 
-// cleanup any old config file we have for tests
-if (exports.TEST) safe.fs.unlinkSync(cloudronConfigFileName);
-
 initConfig();
 
 // set(obj) or set(key, value)
diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index feb38ea31..3a71592ed 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -111,6 +111,7 @@ describe('Apps', function () {
     };
 
     before(function (done) {
+
         async.series([
             database.initialize,
             database._clear,
diff --git a/src/test/config-test.js b/src/test/config-test.js
index e2728310e..b3b56e3af 100644
--- a/src/test/config-test.js
+++ b/src/test/config-test.js
@@ -1,4 +1,3 @@
-/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global after:false */
@@ -6,19 +5,15 @@
 
 'use strict';
 
-var constants = require('../constants.js'),
+var config = require('../config.js'),
+    constants = require('../constants.js'),
     expect = require('expect.js'),
     fs = require('fs'),
-    path = require('path'),
-    paths = require('../paths.js'),
-    safe = require('safetydance');
-
-var config = null;
+    path = require('path');
 
 describe('config', function () {
     before(function () {
-        delete require.cache[require.resolve('../config.js')];
-        config = require('../config.js');
+        config._reset();
     });
 
     after(function () {
diff --git a/src/test/dns-test.js b/src/test/dns-test.js
index e2ba157ba..90d2b3631 100644
--- a/src/test/dns-test.js
+++ b/src/test/dns-test.js
@@ -19,7 +19,8 @@ var async = require('async'),
 describe('dns provider', function () {
     before(function (done) {
         async.series([
-            database.initialize
+            database.initialize,
+            config._reset
         ], done);
     });