diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index 79760af68..9cc036908 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -149,7 +149,10 @@ describe('Apps', function () {
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     describe('validateHostname', function () {
diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index dad36f629..d056e9c5e 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -109,7 +109,10 @@ describe('apptask', function () {
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     it('initializes succesfully', function (done) {
diff --git a/src/test/certificates-test.js b/src/test/certificates-test.js
index bd0dbccd3..fcc56a4a0 100644
--- a/src/test/certificates-test.js
+++ b/src/test/certificates-test.js
@@ -22,7 +22,10 @@ function setup(done) {
 }
 
 function cleanup(done) {
-    database._clear(done);
+    async.series([
+        database._clear,
+        database.uninitialize
+    ], done);
 }
 
 describe('Certificates', function () {
diff --git a/src/test/cloudron-test.js b/src/test/cloudron-test.js
index 5c5d2baf3..373f15b3b 100644
--- a/src/test/cloudron-test.js
+++ b/src/test/cloudron-test.js
@@ -13,13 +13,16 @@ var async = require('async'),
 
 function setup(done) {
     async.series([
-        database.initialize.bind(null),
-        database._clear.bind(null)
+        database.initialize,
+        database._clear
     ], done);
 }
 
 function cleanup(done) {
-    database._clear(done);
+    async.series([
+        database._clear,
+        database.uninitialize
+    ], done);
 }
 
 describe('Cloudron', function () {
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 9d26a63bb..83b485155 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -78,7 +78,10 @@ describe('database', function () {
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     describe('domains', function () {
diff --git a/src/test/digest-test.js b/src/test/digest-test.js
index 210a05c94..a400683a9 100644
--- a/src/test/digest-test.js
+++ b/src/test/digest-test.js
@@ -53,16 +53,6 @@ function checkMails(number, email, done) {
 }
 
 describe('digest', function () {
-    function cleanup(done) {
-        mailer._clearMailQueue();
-        safe.fs.unlinkSync(paths.UPDATE_CHECKER_FILE);
-
-        async.series([
-            settings.uninitialize,
-            database._clear
-        ], done);
-    }
-
     before(function (done) {
         config._reset();
         config.set('fqdn', 'domain.com');
@@ -83,7 +73,16 @@ describe('digest', function () {
         ], done);
     });
 
-    after(cleanup);
+    after(function (done) {
+        mailer._clearMailQueue();
+        safe.fs.unlinkSync(paths.UPDATE_CHECKER_FILE);
+
+        async.series([
+            settings.uninitialize,
+            database._clear,
+            database.uninitialize
+        ], done);
+    });
 
     describe('disabled', function () {
         before(function (done) {
diff --git a/src/test/dns-test.js b/src/test/dns-test.js
index fcbc0241f..c7431c8a5 100644
--- a/src/test/dns-test.js
+++ b/src/test/dns-test.js
@@ -37,7 +37,10 @@ describe('dns provider', function () {
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     describe('noop', function () {
diff --git a/src/test/eventlog-test.js b/src/test/eventlog-test.js
index 0aa6ff698..aaae967a6 100644
--- a/src/test/eventlog-test.js
+++ b/src/test/eventlog-test.js
@@ -6,10 +6,11 @@
 
 'use strict';
 
-var database = require('../database.js'),
-    expect = require('expect.js'),
+var async = require('async'),
+    database = require('../database.js'),
     eventlog = require('../eventlog.js'),
-    EventLogError = eventlog.EventLogError;
+    EventLogError = eventlog.EventLogError,
+    expect = require('expect.js');
 
 function setup(done) {
     // ensure data/config/mount paths
@@ -20,7 +21,10 @@ function setup(done) {
 }
 
 function cleanup(done) {
-    database._clear(done);
+    async.series([
+        database._clear,
+        database.uninitialize
+    ], done);
 }
 
 describe('Eventlog', function () {
diff --git a/src/test/groups-test.js b/src/test/groups-test.js
index ecb3440c5..e4be4f41e 100644
--- a/src/test/groups-test.js
+++ b/src/test/groups-test.js
@@ -67,7 +67,10 @@ function setup(done) {
 }
 
 function cleanup(done) {
-    database._clear(done);
+    async.series([
+        database._clear,
+        database.uninitialize
+    ], done);
 }
 
 describe('Groups', function () {
diff --git a/src/test/janitor-test.js b/src/test/janitor-test.js
index f06155970..91fa2ffde 100644
--- a/src/test/janitor-test.js
+++ b/src/test/janitor-test.js
@@ -55,7 +55,10 @@ describe('janitor', function () {
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     it('can cleanupTokens', function (done) {
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 3cb811c7e..60df0492a 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -182,7 +182,8 @@ function setup(done) {
 function cleanup(done) {
     async.series([
         ldapServer.stop,
-        database._clear
+        database._clear,
+        database.uninitialize
     ], function () {
         dockerProxy.close(function () { done(); }); // some strange error
     });
diff --git a/src/test/settings-test.js b/src/test/settings-test.js
index 415732ab5..a6b3b4c7a 100644
--- a/src/test/settings-test.js
+++ b/src/test/settings-test.js
@@ -45,7 +45,8 @@ function cleanup(done) {
 
     async.series([
         settings.uninitialize,
-        database._clear
+        database._clear,
+        database.uninitialize
     ], done);
 }
 
diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js
index 831fee054..7f946dac2 100644
--- a/src/test/updatechecker-test.js
+++ b/src/test/updatechecker-test.js
@@ -53,7 +53,8 @@ function cleanup(done) {
 
     async.series([
         settings.uninitialize,
-        database._clear
+        database._clear,
+        database.uninitialize
     ], done);
 }
 
diff --git a/src/test/user-test.js b/src/test/user-test.js
index fdc9155b1..993556851 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -80,7 +80,10 @@ function setup(done) {
 function cleanup(done) {
     mailer._clearMailQueue();
 
-    database._clear(done);
+    async.series([
+        database._clear,
+        database.uninitialize
+    ], done);
 }
 
 function checkMails(number, options, callback) {