diff --git a/package.json b/package.json
index 0dd78e6ac..f1ee872d6 100644
--- a/package.json
+++ b/package.json
@@ -98,18 +98,9 @@
   "scripts": {
     "solid": "node ./bin/solid",
     "standard": "standard",
-    "mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha ./test/**/*.js",
-    "test": "npm run standard && npm run mocha",
-    "test-integration": "mocha ./test/integration/*.js",
-    "test-unit": "mocha ./test/unit/*.js",
-    "test-debug": "DEBUG='solid:*' ./node_modules/mocha/bin/mocha ./test/*.js",
-    "test-acl": "./node_modules/mocha/bin/mocha ./test/acl.js",
-    "test-params": "./node_modules/mocha/bin/mocha ./test/params.js",
-    "test-http": "./node_modules/mocha/bin/mocha ./test/http.js",
-    "test-formats": "./node_modules/mocha/bin/mocha ./test/formats.js",
-    "test-errors": "./node_modules/mocha/bin/mocha ./test/errors.js",
-    "clean": "rm -rf config.json accounts profile inbox .acl settings .meta .meta.acl",
-    "clean-account": "rm -rf accounts profile inbox .acl .meta settings .meta.acl"
+    "nyc": "NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha",
+    "mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 mocha",
+    "test": "npm run standard && npm run nyc"
   },
   "nyc": {
     "reporter": [
diff --git a/test/integration/account-creation-oidc.js b/test/integration/account-creation-oidc-test.js
similarity index 99%
rename from test/integration/account-creation-oidc.js
rename to test/integration/account-creation-oidc-test.js
index d4cbe66e5..34997fc03 100644
--- a/test/integration/account-creation-oidc.js
+++ b/test/integration/account-creation-oidc-test.js
@@ -2,7 +2,7 @@ const supertest = require('supertest')
 // Helper functions for the FS
 const $rdf = require('rdflib')
 
-const { rm, read } = require('../test-utils')
+const { rm, read } = require('../utils')
 const ldnode = require('../../index')
 const path = require('path')
 const fs = require('fs-extra')
diff --git a/test/integration/account-creation-tls.js b/test/integration/account-creation-tls-test.js
similarity index 99%
rename from test/integration/account-creation-tls.js
rename to test/integration/account-creation-tls-test.js
index ea459579f..d345915d9 100644
--- a/test/integration/account-creation-tls.js
+++ b/test/integration/account-creation-tls-test.js
@@ -2,7 +2,7 @@
 // // Helper functions for the FS
 // const $rdf = require('rdflib')
 //
-// const { rm, read } = require('../test-utils')
+// const { rm, read } = require('../utils')
 // const ldnode = require('../../index')
 // const fs = require('fs-extra')
 // const path = require('path')
diff --git a/test/integration/account-manager.js b/test/integration/account-manager-test.js
similarity index 100%
rename from test/integration/account-manager.js
rename to test/integration/account-manager-test.js
diff --git a/test/integration/account-template.js b/test/integration/account-template-test.js
similarity index 100%
rename from test/integration/account-template.js
rename to test/integration/account-template-test.js
diff --git a/test/integration/acl-oidc.js b/test/integration/acl-oidc-test.js
similarity index 99%
rename from test/integration/acl-oidc.js
rename to test/integration/acl-oidc-test.js
index 060bfa8b0..23c8322d1 100644
--- a/test/integration/acl-oidc.js
+++ b/test/integration/acl-oidc-test.js
@@ -2,7 +2,7 @@ const assert = require('chai').assert
 const fs = require('fs-extra')
 const request = require('request')
 const path = require('path')
-const rm = require('../test-utils').rm
+const rm = require('../utils').rm
 
 const ldnode = require('../../index')
 
diff --git a/test/integration/acl-tls.js b/test/integration/acl-tls-test.js
similarity index 99%
rename from test/integration/acl-tls.js
rename to test/integration/acl-tls-test.js
index fb3fc70a0..c5a49e861 100644
--- a/test/integration/acl-tls.js
+++ b/test/integration/acl-tls-test.js
@@ -10,10 +10,10 @@ var path = require('path')
  */
 
 // Helper functions for the FS
-var rm = require('../test-utils').rm
-// var write = require('./test-utils').write
-// var cp = require('./test-utils').cp
-// var read = require('./test-utils').read
+var rm = require('../utils').rm
+// var write = require('./utils').write
+// var cp = require('./utils').cp
+// var read = require('./utils').read
 
 var ldnode = require('../../index')
 var ns = require('solid-namespace')($rdf)
diff --git a/test/integration/auth-proxy.js b/test/integration/auth-proxy-test.js
similarity index 97%
rename from test/integration/auth-proxy.js
rename to test/integration/auth-proxy-test.js
index ccc88b68f..238696721 100644
--- a/test/integration/auth-proxy.js
+++ b/test/integration/auth-proxy-test.js
@@ -3,7 +3,7 @@ const path = require('path')
 const nock = require('nock')
 const request = require('supertest')
 const { expect } = require('chai')
-const rm = require('../test-utils').rm
+const rm = require('../utils').rm
 
 const HOST = 'solid.org'
 const USER = 'https://ruben.verborgh.org/profile/#me'
diff --git a/test/integration/authentication-oidc.js b/test/integration/authentication-oidc-test.js
similarity index 100%
rename from test/integration/authentication-oidc.js
rename to test/integration/authentication-oidc-test.js
diff --git a/test/integration/capability-discovery.js b/test/integration/capability-discovery-test.js
similarity index 100%
rename from test/integration/capability-discovery.js
rename to test/integration/capability-discovery-test.js
diff --git a/test/integration/cors-proxy.js b/test/integration/cors-proxy-test.js
similarity index 100%
rename from test/integration/cors-proxy.js
rename to test/integration/cors-proxy-test.js
diff --git a/test/integration/errors-oidc.js b/test/integration/errors-oidc-test.js
similarity index 100%
rename from test/integration/errors-oidc.js
rename to test/integration/errors-oidc-test.js
diff --git a/test/integration/errors.js b/test/integration/errors-test.js
similarity index 89%
rename from test/integration/errors.js
rename to test/integration/errors-test.js
index eb67ccd5c..8b73d5e2f 100644
--- a/test/integration/errors.js
+++ b/test/integration/errors-test.js
@@ -2,10 +2,10 @@ var supertest = require('supertest')
 var path = require('path')
 
 // Helper functions for the FS
-// var rm = require('./test-utils').rm
-// var write = require('./test-utils').write
-// var cp = require('./test-utils').cp
-var read = require('./../test-utils').read
+// var rm = require('./utils').rm
+// var write = require('./utils').write
+// var cp = require('./utils').cp
+var read = require('./../utils').read
 
 var ldnode = require('../../index')
 
diff --git a/test/integration/formats.js b/test/integration/formats-test.js
similarity index 100%
rename from test/integration/formats.js
rename to test/integration/formats-test.js
diff --git a/test/integration/http-copy.js b/test/integration/http-copy-test.js
similarity index 98%
rename from test/integration/http-copy.js
rename to test/integration/http-copy-test.js
index 5856bd43d..56d660a38 100644
--- a/test/integration/http-copy.js
+++ b/test/integration/http-copy-test.js
@@ -3,7 +3,7 @@ var fs = require('fs')
 var request = require('request')
 var path = require('path')
 // Helper functions for the FS
-var rm = require('./../test-utils').rm
+var rm = require('./../utils').rm
 
 var solidServer = require('../../index')
 
diff --git a/test/integration/http.js b/test/integration/http-test.js
similarity index 99%
rename from test/integration/http.js
rename to test/integration/http-test.js
index c81e79167..bfcbcff52 100644
--- a/test/integration/http.js
+++ b/test/integration/http-test.js
@@ -2,7 +2,7 @@ var supertest = require('supertest')
 var fs = require('fs')
 var li = require('li')
 var ldnode = require('../../index')
-var rm = require('./../test-utils').rm
+var rm = require('./../utils').rm
 var path = require('path')
 const rdf = require('rdflib')
 
diff --git a/test/integration/ldp.js b/test/integration/ldp-test.js
similarity index 98%
rename from test/integration/ldp.js
rename to test/integration/ldp-test.js
index de496a6a3..932f4656c 100644
--- a/test/integration/ldp.js
+++ b/test/integration/ldp-test.js
@@ -6,10 +6,10 @@ var path = require('path')
 var stringToStream = require('../../lib/utils').stringToStream
 
 // Helper functions for the FS
-var rm = require('./../test-utils').rm
-var write = require('./../test-utils').write
-// var cp = require('./test-utils').cp
-var read = require('./../test-utils').read
+var rm = require('./../utils').rm
+var write = require('./../utils').write
+// var cp = require('./utils').cp
+var read = require('./../utils').read
 var fs = require('fs')
 
 describe('LDP', function () {
diff --git a/test/integration/oidc-manager.js b/test/integration/oidc-manager-test.js
similarity index 100%
rename from test/integration/oidc-manager.js
rename to test/integration/oidc-manager-test.js
diff --git a/test/integration/params.js b/test/integration/params-test.js
similarity index 96%
rename from test/integration/params.js
rename to test/integration/params-test.js
index 00c7f3e4d..71629b3a4 100644
--- a/test/integration/params.js
+++ b/test/integration/params-test.js
@@ -3,10 +3,10 @@ var supertest = require('supertest')
 var path = require('path')
 const fs = require('fs-extra')
 // Helper functions for the FS
-var rm = require('../test-utils').rm
-var write = require('../test-utils').write
-// var cp = require('./test-utils').cp
-var read = require('../test-utils').read
+var rm = require('../utils').rm
+var write = require('../utils').write
+// var cp = require('./utils').cp
+var read = require('../utils').read
 
 var ldnode = require('../../index')
 
diff --git a/test/integration/patch-2.js b/test/integration/patch-2-test.js
similarity index 97%
rename from test/integration/patch-2.js
rename to test/integration/patch-2-test.js
index acfeb71cf..59842bb0d 100644
--- a/test/integration/patch-2.js
+++ b/test/integration/patch-2-test.js
@@ -4,10 +4,10 @@ var assert = require('chai').assert
 var path = require('path')
 
 // Helper functions for the FS
-var rm = require('../test-utils').rm
-var write = require('../test-utils').write
-// var cp = require('./test-utils').cp
-var read = require('../test-utils').read
+var rm = require('../utils').rm
+var write = require('../utils').write
+// var cp = require('./utils').cp
+var read = require('../utils').read
 
 describe('PATCH', function () {
   // Starting LDP
diff --git a/test/integration/patch.js b/test/integration/patch-test.js
similarity index 97%
rename from test/integration/patch.js
rename to test/integration/patch-test.js
index c5247c799..440ba91d6 100644
--- a/test/integration/patch.js
+++ b/test/integration/patch-test.js
@@ -4,10 +4,10 @@ var assert = require('chai').assert
 var path = require('path')
 
 // Helper functions for the FS
-var rm = require('../test-utils').rm
-var write = require('../test-utils').write
-// var cp = require('./test-utils').cp
-var read = require('../test-utils').read
+var rm = require('../utils').rm
+var write = require('../utils').write
+// var cp = require('./utils').cp
+var read = require('../utils').read
 
 describe('PATCH', function () {
   // Starting LDP
diff --git a/test/mocha.opts b/test/mocha.opts
index 907011807..748f8d823 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1 +1,2 @@
+--recursive
 --timeout 10000
diff --git a/test/resources/accounts-acl/config/templates/emails/welcome.js b/test/resources/accounts-acl/config/templates/emails/welcome-test.js
similarity index 100%
rename from test/resources/accounts-acl/config/templates/emails/welcome.js
rename to test/resources/accounts-acl/config/templates/emails/welcome-test.js
diff --git a/test/unit/account-manager.js b/test/unit/account-manager-test.js
similarity index 100%
rename from test/unit/account-manager.js
rename to test/unit/account-manager-test.js
diff --git a/test/unit/account-template.js b/test/unit/account-template-test.js
similarity index 100%
rename from test/unit/account-template.js
rename to test/unit/account-template-test.js
diff --git a/test/unit/acl-checker.js b/test/unit/acl-checker-test.js
similarity index 100%
rename from test/unit/acl-checker.js
rename to test/unit/acl-checker-test.js
diff --git a/test/unit/add-cert-request.js b/test/unit/add-cert-request-test.js
similarity index 100%
rename from test/unit/add-cert-request.js
rename to test/unit/add-cert-request-test.js
diff --git a/test/unit/auth-handlers.js b/test/unit/auth-handlers-test.js
similarity index 100%
rename from test/unit/auth-handlers.js
rename to test/unit/auth-handlers-test.js
diff --git a/test/unit/auth-proxy.js b/test/unit/auth-proxy-test.js
similarity index 100%
rename from test/unit/auth-proxy.js
rename to test/unit/auth-proxy-test.js
diff --git a/test/unit/auth-request.js b/test/unit/auth-request-test.js
similarity index 100%
rename from test/unit/auth-request.js
rename to test/unit/auth-request-test.js
diff --git a/test/unit/authenticator.js b/test/unit/authenticator-test.js
similarity index 100%
rename from test/unit/authenticator.js
rename to test/unit/authenticator-test.js
diff --git a/test/unit/create-account-request.js b/test/unit/create-account-request-test.js
similarity index 100%
rename from test/unit/create-account-request.js
rename to test/unit/create-account-request-test.js
diff --git a/test/unit/email-service.js b/test/unit/email-service-test.js
similarity index 100%
rename from test/unit/email-service.js
rename to test/unit/email-service-test.js
diff --git a/test/unit/email-welcome.js b/test/unit/email-welcome-test.js
similarity index 100%
rename from test/unit/email-welcome.js
rename to test/unit/email-welcome-test.js
diff --git a/test/unit/error-pages.js b/test/unit/error-pages-test.js
similarity index 100%
rename from test/unit/error-pages.js
rename to test/unit/error-pages-test.js
diff --git a/test/unit/force-user.js b/test/unit/force-user-test.js
similarity index 100%
rename from test/unit/force-user.js
rename to test/unit/force-user-test.js
diff --git a/test/unit/login-request.js b/test/unit/login-request-test.js
similarity index 100%
rename from test/unit/login-request.js
rename to test/unit/login-request-test.js
diff --git a/test/unit/oidc-manager.js b/test/unit/oidc-manager-test.js
similarity index 100%
rename from test/unit/oidc-manager.js
rename to test/unit/oidc-manager-test.js
diff --git a/test/unit/password-authenticator.js b/test/unit/password-authenticator-test.js
similarity index 100%
rename from test/unit/password-authenticator.js
rename to test/unit/password-authenticator-test.js
diff --git a/test/unit/password-change-request.js b/test/unit/password-change-request-test.js
similarity index 100%
rename from test/unit/password-change-request.js
rename to test/unit/password-change-request-test.js
diff --git a/test/unit/password-reset-email-request.js b/test/unit/password-reset-email-request-test.js
similarity index 100%
rename from test/unit/password-reset-email-request.js
rename to test/unit/password-reset-email-request-test.js
diff --git a/test/unit/solid-host.js b/test/unit/solid-host-test.js
similarity index 100%
rename from test/unit/solid-host.js
rename to test/unit/solid-host-test.js
diff --git a/test/unit/tls-authenticator.js b/test/unit/tls-authenticator-test.js
similarity index 100%
rename from test/unit/tls-authenticator.js
rename to test/unit/tls-authenticator-test.js
diff --git a/test/unit/token-service.js b/test/unit/token-service-test.js
similarity index 100%
rename from test/unit/token-service.js
rename to test/unit/token-service-test.js
diff --git a/test/unit/user-account.js b/test/unit/user-account-test.js
similarity index 100%
rename from test/unit/user-account.js
rename to test/unit/user-account-test.js
diff --git a/test/unit/user-accounts-api.js b/test/unit/user-accounts-api-test.js
similarity index 100%
rename from test/unit/user-accounts-api.js
rename to test/unit/user-accounts-api-test.js
diff --git a/test/unit/utils.js b/test/unit/utils-test.js
similarity index 100%
rename from test/unit/utils.js
rename to test/unit/utils-test.js
diff --git a/test/test-utils.js b/test/utils.js
similarity index 100%
rename from test/test-utils.js
rename to test/utils.js