diff --git a/.mocharc.json b/.mocharc.json
index 3495e1e777..b65763d3ba 100644
--- a/.mocharc.json
+++ b/.mocharc.json
@@ -1,5 +1,6 @@
 {
   "extension": ["ts"],
   "spec": "src/**/*.spec.ts",
-  "require": "ts-node/register"
+  "require": "ts-node/register",
+  "exit": true
 }
diff --git a/package.json b/package.json
index 09b094a560..10bd014590 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "test:lint": "eslint src --ext .ts",
     "test:prettier": "prettier \"src/**/*.ts\" \"./*.json\" --list-different",
     "test:spelling": "cspell \"{README.md,.github/*.md,src/**/*.ts}\"",
-    "test:unit": "nyc --silent mocha --exit # TODO: Remove `--exit` and fix hanging processes",
+    "test:unit": "nyc --silent mocha",
     "proto": "run-s proto:*",
     "proto:lint": "buf lint",
     "proto:build": "buf generate",