diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index 7b1e5cb604..27dab2b647 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -87,6 +87,9 @@ before(function (done) {
 		function (next) {
 			db.init(next);
 		},
+		function (next) {
+			db.createIndices(next);
+		},
 		function (next) {
 			setupMockDefaults(next);
 		},
@@ -146,9 +149,6 @@ function setupMockDefaults(callback) {
 		function (next) {
 			db.emptydb(next);
 		},
-		function (next) {
-			db.createIndices(next);
-		},
 		function (next) {
 			winston.info('test_database flushed');
 			setupDefaultConfigs(meta, next);