diff --git a/mocks/databasemock.js b/mocks/databasemock.js
index a75a1e89a1..3b99f075ff 100644
--- a/mocks/databasemock.js
+++ b/mocks/databasemock.js
@@ -79,7 +79,7 @@
 				}
 
 				winston.info('test_database flushed');
-				/*
+
 				meta.configs.init(function () {
 					nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
 					nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
@@ -90,8 +90,7 @@
 						sockets.init(webserver.server);
 
 					done();
-				});*/
-				done();
+				});
 			});
 		});
 	});
diff --git a/package.json b/package.json
index 25eed44af8..785d0def25 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "start": "./nodebb start",
     "stop": "./nodebb stop",
-    "test": "mocha ./tests/database.js -t 1000"
+    "test": "mocha ./tests -t 1000"
   },
   "dependencies": {
     "express": "3.2.0",