diff --git a/.mocharc-default.yml b/.mocharc-default.yml
deleted file mode 100644
index 1bb8bf6d..00000000
--- a/.mocharc-default.yml
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/.mocharc-unit.yml b/.mocharc-unit.yml
deleted file mode 100644
index c19fe15a..00000000
--- a/.mocharc-unit.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-require:
-  - source-map-support/register
-spec:
-  - out/**/*.test.js
-  - addons/**/out/*.test.js
-watch-files:
-  - out/**/*.js
-  - addons/**/out/*.js
-reporter: spec
-color: true
-check-leaks: true
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 55a15a6a..28d340ae 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,9 @@
 {
-    "typescript.preferences.importModuleSpecifier": "non-relative",
-    "typescript.preferences.quoteStyle": "single",
-    "mochaExplorer.envPath": ".mocha.env",
-    "mochaExplorer.configFile": ".mocharc-unit.yml"
+  "typescript.preferences.importModuleSpecifier": "non-relative",
+  "typescript.preferences.quoteStyle": "single",
+  "mochaExplorer.envPath": ".mocha.env",
+  "mochaExplorer.files": [
+    "out/**/*.test.js",
+    "addons/**/out/*.test.js"
+  ]
 }
diff --git a/bin/test.js b/bin/test.js
index e8416d38..b9725acd 100644
--- a/bin/test.js
+++ b/bin/test.js
@@ -17,9 +17,7 @@ let testFiles = [
   './addons/**/out/*test.js',
 ];
 
-let flagArgs = [
-  '--config', ".mocharc-default.yml"
-];
+let flagArgs = [];
 
 if (process.argv.length > 2) {
   const args = process.argv.slice(2);
diff --git a/bin/test_api.js b/bin/test_api.js
index bbf11bff..ff166727 100644
--- a/bin/test_api.js
+++ b/bin/test_api.js
@@ -17,9 +17,7 @@ let testFiles = [
 ];
 
 
-let flagArgs = [
-  '--config', ".mocharc-default.yml"
-];
+let flagArgs = [];
 
 if (process.argv.length > 2) {
   const args = process.argv.slice(2);