diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index a70c58bc4..b2a9a6f4a 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -69,6 +69,7 @@ describe('apptask', function () {
     before(function (done) {
         config.set('version', '0.5.0');
         config.set('fqdn', 'foobar.com');
+        config.set('provider', 'caas');
 
         awsHostedZones = {
             HostedZones: [{
diff --git a/src/test/settings-test.js b/src/test/settings-test.js
index f00839b48..7a350d074 100644
--- a/src/test/settings-test.js
+++ b/src/test/settings-test.js
@@ -12,6 +12,8 @@ var async = require('async'),
     settings = require('../settings.js');
 
 function setup(done) {
+    config.set('provider', 'caas');
+
     async.series([
         database.initialize,
         settings.initialize,
diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js
index 2a90a29c4..5f6e3b17a 100644
--- a/src/test/updatechecker-test.js
+++ b/src/test/updatechecker-test.js
@@ -10,7 +10,6 @@ var appdb = require('../appdb.js'),
     config = require('../config.js'),
     constants = require('../constants.js'),
     database = require('../database.js'),
-    deepExtend = require('deep-extend'),
     expect = require('expect.js'),
     mailer = require('../mailer.js'),
     nock = require('nock'),
@@ -19,8 +18,7 @@ var appdb = require('../appdb.js'),
     settings = require('../settings.js'),
     settingsdb = require('../settingsdb.js'),
     updatechecker = require('../updatechecker.js'),
-    user = require('../user.js'),
-    _ = require('underscore');
+    user = require('../user.js');
 
 // owner
 var USER_0 = {
@@ -54,7 +52,9 @@ function cleanup(done) {
 
 describe('updatechecker - box - manual (mail)', function () {
     before(function (done) {
+        config._reset();
         config.set('version', '1.0.0');
+        config.set('apiServerOrigin', 'http://localhost:4444');
         config.set('provider', 'notcaas');
         safe.fs.unlinkSync(paths.UPDATE_CHECKER_FILE);
 
@@ -165,6 +165,7 @@ describe('updatechecker - box - manual (mail)', function () {
 describe('updatechecker - box - automatic', function () {
     before(function (done) {
         config.set('version', '1.0.0');
+        config.set('apiServerOrigin', 'http://localhost:4444');
         config.set('provider', 'notcaas');
         async.series([
             database.initialize,