diff --git a/test/integration/account-creation-oidc.js b/test/integration/account-creation-oidc.js
index 39f9f21fa..d4cbe66e5 100644
--- a/test/integration/account-creation-oidc.js
+++ b/test/integration/account-creation-oidc.js
@@ -8,8 +8,6 @@ const path = require('path')
 const fs = require('fs-extra')
 
 describe('AccountManager (OIDC account creation tests)', function () {
-  this.timeout(10000)
-
   var serverUri = 'https://localhost:3457'
   var host = 'localhost:3457'
   var ldpHttpsServer
diff --git a/test/integration/account-creation-tls.js b/test/integration/account-creation-tls.js
index 27376f58f..ea459579f 100644
--- a/test/integration/account-creation-tls.js
+++ b/test/integration/account-creation-tls.js
@@ -8,8 +8,6 @@
 // const path = require('path')
 //
 // describe('AccountManager (TLS account creation tests)', function () {
-//   this.timeout(10000)
-//
 //   var address = 'https://localhost:3457'
 //   var host = 'localhost:3457'
 //   var ldpHttpsServer
diff --git a/test/integration/acl-oidc.js b/test/integration/acl-oidc.js
index 63063ad57..060bfa8b0 100644
--- a/test/integration/acl-oidc.js
+++ b/test/integration/acl-oidc.js
@@ -37,8 +37,6 @@ const argv = {
 }
 
 describe('ACL HTTP', function () {
-  this.timeout(10000)
-
   var ldp, ldpHttpsServer
 
   before(done => {
diff --git a/test/integration/acl-tls.js b/test/integration/acl-tls.js
index 03fb744f3..fb3fc70a0 100644
--- a/test/integration/acl-tls.js
+++ b/test/integration/acl-tls.js
@@ -52,7 +52,6 @@ var userCredentials = {
 }
 
 describe('ACL with WebID+TLS', function () {
-  this.timeout(10000)
   var ldpHttpsServer
   var ldp = ldnode.createServer({
     mount: '/test',
@@ -973,8 +972,6 @@ describe('ACL with WebID+TLS', function () {
 })
 
 describe('ACL with WebID through X-SSL-Cert', function () {
-  this.timeout(10000)
-
   var ldpHttpsServer
   before(function (done) {
     const ldp = ldnode.createServer({
diff --git a/test/integration/http-copy.js b/test/integration/http-copy.js
index 20583800b..5856bd43d 100644
--- a/test/integration/http-copy.js
+++ b/test/integration/http-copy.js
@@ -8,7 +8,6 @@ var rm = require('./../test-utils').rm
 var solidServer = require('../../index')
 
 describe('HTTP COPY API', function () {
-  this.timeout(10000)
   var address = 'https://localhost:3456'
 
   var ldpHttpsServer
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 000000000..907011807
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1 @@
+--timeout 10000
diff --git a/test/unit/add-cert-request.js b/test/unit/add-cert-request.js
index 05d907859..1d1544c12 100644
--- a/test/unit/add-cert-request.js
+++ b/test/unit/add-cert-request.js
@@ -111,7 +111,7 @@ describe('AddCertificateRequest', () => {
           expect(graph.anyStatementMatching(key, ns.cert('exponent')))
             .to.exist
         })
-    }).timeout(3000)
+    })
   })
 })