diff --git a/package.json b/package.json
index 68fb0519e..f5c1764c9 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
     "test": "npm-run-all test:jest test:mocha",
     "test:jest": "TEST_MODE=unit NODE_ENV=test jest --runInBand",
     "test:client": "TEST_MODE=unit NODE_ENV=test jest --projects client",
-    "test:mocha": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
+    "test:server": "npm-run-all test:server:jest test:server:mocha",
+    "test:server:mocha": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
     "test:server:jest": "TEST_MODE=unit NODE_ENV=test jest --runInBand --projects .",
     "e2e": "./scripts/e2e.js",
     "e2e:ci": "./scripts/e2e-ci.sh",
diff --git a/services/mongoose.js b/services/mongoose.js
index 66304ee07..4e242cf47 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -42,10 +42,6 @@ if (WEBPACK) {
     logger.debug('mongodb disconnected')
   );
 
-  setTimeout(() => {
-    mongoose.disconnect();
-  }, 5000);
-
   // Connect to the Mongo instance.
   mongoose
     .connect(MONGO_URL, {