diff --git a/src/routes/test/backups-test.js b/src/routes/test/backups-test.js
index 06bc89005..9b00c4c4e 100644
--- a/src/routes/test/backups-test.js
+++ b/src/routes/test/backups-test.js
@@ -13,7 +13,6 @@ var appdb = require('../../appdb.js'),
     superagent = require('superagent'),
     server = require('../../server.js'),
     settings = require('../../settings.js'),
-    settingsdb = require('../../settingsdb.js'),
     nock = require('nock');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -56,7 +55,7 @@ function setup(done) {
         },
 
         function createSettings(callback) {
-            settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }), callback);
+            settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback);
         }
     ], done);
 }
diff --git a/src/routes/test/cloudron-test.js b/src/routes/test/cloudron-test.js
index cb4653a34..b7e70baa8 100644
--- a/src/routes/test/cloudron-test.js
+++ b/src/routes/test/cloudron-test.js
@@ -15,7 +15,6 @@ var async = require('async'),
     superagent = require('superagent'),
     server = require('../../server.js'),
     settings = require('../../settings.js'),
-    settingsdb = require('../../settingsdb.js'),
     shell = require('../../shell.js');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -32,7 +31,7 @@ function setup(done) {
 
     server.start(function (error) {
         if (error) return done(error);
-        settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }), done);
+        settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, done);
     });
 }
 
diff --git a/src/routes/test/settings-test.js b/src/routes/test/settings-test.js
index d4031eb0d..688e5685e 100644
--- a/src/routes/test/settings-test.js
+++ b/src/routes/test/settings-test.js
@@ -1,4 +1,3 @@
-/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global before:false */
diff --git a/src/routes/test/simpleauth-test.js b/src/routes/test/simpleauth-test.js
index e047cd604..059b50557 100644
--- a/src/routes/test/simpleauth-test.js
+++ b/src/routes/test/simpleauth-test.js
@@ -16,8 +16,7 @@ var appdb = require('../../appdb.js'),
     server = require('../../server.js'),
     simpleauth = require('../../simpleauth.js'),
     nock = require('nock'),
-    settings = require('../../settings.js'),
-    settingsdb = require('../../settingsdb.js');
+    settings = require('../../settings.js');
 
 describe('SimpleAuth API', function () {
     var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -165,7 +164,7 @@ describe('SimpleAuth API', function () {
             appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1),
             appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2),
             appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3),
-            settingsdb.set.bind(null, settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }))
+            settings.setBackupConfig.bind(null, { provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' })
         ], done);
     });
 
diff --git a/src/routes/test/sysadmin-test.js b/src/routes/test/sysadmin-test.js
index cf306053e..e4f81ba7c 100644
--- a/src/routes/test/sysadmin-test.js
+++ b/src/routes/test/sysadmin-test.js
@@ -13,7 +13,6 @@ var appdb = require('../../appdb.js'),
     superagent = require('superagent'),
     server = require('../../server.js'),
     settings = require('../../settings.js'),
-    settingsdb = require('../../settingsdb.js'),
     nock = require('nock');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -56,7 +55,7 @@ function setup(done) {
         },
 
         function createSettings(callback) {
-            settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }), callback);
+            settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback);
         }
     ], done);
 }
diff --git a/src/test/settings-test.js b/src/test/settings-test.js
index ce85aeadc..1e3bbb49f 100644
--- a/src/test/settings-test.js
+++ b/src/test/settings-test.js
@@ -7,8 +7,7 @@
 
 var database = require('../database.js'),
     expect = require('expect.js'),
-    settings = require('../settings.js'),
-    settingsdb = require('../settingsdb.js');
+    settings = require('../settings.js');
 
 function setup(done) {
     // ensure data/config/mount paths
@@ -16,7 +15,7 @@ function setup(done) {
         expect(error).to.be(null);
 
         // a cloudron must have a backup config to startup
-        settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'foo', key: 'key'}), function (error) {
+        settings.setBackupConfig({ provider: 'caas', token: 'foo', key: 'key'}, function (error) {
             expect(error).to.be(null);
             done();
         });