diff --git a/package.json b/package.json
index 3a2e0ec368363bb4b259b123dcb21642954996f9..f3cff63179886c1a3626c5be5f1b5d220a8ff386 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "A bridge between Matrix and Discord",
   "main": "discordas.js",
   "scripts": {
-    "test": "npm run-script build && mocha --opts test/mocha.opts build/test",
+    "test": "npm run-script build && mocha --opts test/mocha.opts build/test/config.js build/test",
     "lint": "tslint --project ./tsconfig.json --type-check -t stylish",
     "coverage": "istanbul --include-all-sources cover -x build/src/discordas.js _mocha -- build/test/ -R spec",
     "build": "tsc",
diff --git a/test/config.ts b/test/config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..cba8b315bc53f11a180327733e313476f7976ea0
--- /dev/null
+++ b/test/config.ts
@@ -0,0 +1,6 @@
+import {argv} from "process";
+import {Log} from "../src/log";
+
+if (!argv.includes("--noisy")) {
+    Log.ForceSilent();
+}
diff --git a/test/test_clientfactory.ts b/test/test_clientfactory.ts
index 0d0d8f2a92427796d4efdbf05a0ec8e46d66dad7..6660d4cc2f6246ad74c180fcf7fb05d4b784c8a4 100644
--- a/test/test_clientfactory.ts
+++ b/test/test_clientfactory.ts
@@ -3,9 +3,6 @@ import * as ChaiAsPromised from "chai-as-promised";
 import * as Proxyquire from "proxyquire";
 import {DiscordBridgeConfigAuth} from "../src/config";
 import {MockDiscordClient} from "./mocks/discordclient";
-import { Log } from "../src/log";
-
-Log.Configure({console: "silly", lineDateFormat: undefined, files: []});
 
 Chai.use(ChaiAsPromised);
 const expect = Chai.expect;