diff --git a/src/database.js b/src/database.js
index 66f503370f..8fcd8e0712 100644
--- a/src/database.js
+++ b/src/database.js
@@ -5,6 +5,7 @@ var nconf = require('nconf'),
 	secondaryDBConfig = nconf.get('secondary_database'),
 	secondaryModules = nconf.get('secondary_db_modules'),
 	winston = require('winston'),
+	async = require('async'),
 
 	ALLOWED_MODULES = ['hash', 'list', 'sets', 'sorted'];
 
@@ -23,6 +24,17 @@ function setupSecondaryDB() {
 			primaryDB[module] = secondaryDB[module];
 		}
 	}
+
+	var primaryDBinit = primaryDB.init,
+		primaryDBclose = primaryDB.close;
+
+	primaryDB.init = function(callback) {
+		async.parallel([primaryDBinit, secondaryDB.init], callback);
+	};
+
+	primaryDB.close = function(callback) {
+		async.parallel([primaryDBclose, secondaryDB.close], callback);
+	};
 }