diff --git a/tests/categories.js b/tests/categories.js
index 7115b88597..4ec06ab3b4 100644
--- a/tests/categories.js
+++ b/tests/categories.js
@@ -89,7 +89,7 @@ describe('Categories', function() {
 		});
 	});
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/database/hash.js b/tests/database/hash.js
index 469172ce70..a178280e3c 100644
--- a/tests/database/hash.js
+++ b/tests/database/hash.js
@@ -369,7 +369,7 @@ describe('Hash methods', function() {
 
 
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/database/keys.js b/tests/database/keys.js
index 36e5fe5989..832c91bcba 100644
--- a/tests/database/keys.js
+++ b/tests/database/keys.js
@@ -142,7 +142,7 @@ describe('Key methods', function() {
 	});
 
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/database/list.js b/tests/database/list.js
index 59fa82aa58..137c465c2e 100644
--- a/tests/database/list.js
+++ b/tests/database/list.js
@@ -158,7 +158,7 @@ describe('List methods', function() {
 	});
 
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/database/sets.js b/tests/database/sets.js
index a7a23f4dd8..2b852a5341 100644
--- a/tests/database/sets.js
+++ b/tests/database/sets.js
@@ -229,7 +229,7 @@ describe('Set methods', function() {
 	});
 
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/database/sorted.js b/tests/database/sorted.js
index 9705f4fff1..64e8891a30 100644
--- a/tests/database/sorted.js
+++ b/tests/database/sorted.js
@@ -533,7 +533,7 @@ describe('Sorted Set methods', function() {
 	});
 
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/groups.js b/tests/groups.js
index a86495071f..6c30bddd77 100644
--- a/tests/groups.js
+++ b/tests/groups.js
@@ -342,7 +342,7 @@ describe('Groups', function() {
 		});
 	});
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/messaging.js b/tests/messaging.js
index 4758fde40b..3092e42b35 100644
--- a/tests/messaging.js
+++ b/tests/messaging.js
@@ -66,7 +66,7 @@ describe('Messaging Library', function() {
 		});
 	});
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/topics.js b/tests/topics.js
index 0c04d875bf..dcf7f1067e 100644
--- a/tests/topics.js
+++ b/tests/topics.js
@@ -387,7 +387,7 @@ describe('Topic\'s', function() {
 		});
 	});
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
diff --git a/tests/user.js b/tests/user.js
index 570b002808..30a835fe83 100644
--- a/tests/user.js
+++ b/tests/user.js
@@ -282,7 +282,7 @@ describe('User', function() {
 		});
 	});
 
-	after(function() {
-		db.flushdb();
+	after(function(done) {
+		db.flushdb(done);
 	});
 });
\ No newline at end of file