diff --git a/.mocharc.yml b/.mocharc.yml
new file mode 100644
index 00000000..066a8425
--- /dev/null
+++ b/.mocharc.yml
@@ -0,0 +1,4 @@
+require: test/helpers/init.js
+recursive: true
+reporter: spec
+timeout: false
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index 8dda5560..00000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---require test/helpers/init.js
---recursive
---reporter spec
---timeout 10000