diff --git a/package.json b/package.json
index 42800cb..e44997a 100644
--- a/package.json
+++ b/package.json
@@ -56,9 +56,9 @@
     "node": ">=4.2.3"
   },
   "scripts": {
-    "quick": "./node_modules/tape/bin/tape ./test/*.js | node_modules/tap-spec/bin/cmd.js",
-    "test": "istanbul cover ./node_modules/tape/bin/tape ./test/*.js  | node_modules/tap-spec/bin/cmd.js",
-    "coverage": "istanbul cover ./node_modules/tape/bin/tape ./test/*.js && istanbul check-coverage --statements 100 --functions 100 --lines 100 --branches 100",
+    "quick": "./node_modules/tape/bin/tape ./test/*.test.js | node_modules/tap-spec/bin/cmd.js",
+    "test": "istanbul cover ./node_modules/tape/bin/tape ./test/*.test.js  | node_modules/tap-spec/bin/cmd.js",
+    "coverage": "istanbul cover ./node_modules/tape/bin/tape ./test/*.test.js && istanbul check-coverage --statements 100 --functions 100 --lines 100 --branches 100",
     "jshint": "./node_modules/jshint/bin/jshint -c .jshintrc --exclude-path .gitignore .",
     "start": "node example/server.js",
     "report": "open coverage/lcov-report/index.html"
diff --git a/test/basic_test.js b/test/basic.test.js
similarity index 100%
rename from test/basic_test.js
rename to test/basic.test.js
diff --git a/test/complete_token_test.js b/test/complete_token.test.js
similarity index 100%
rename from test/complete_token_test.js
rename to test/complete_token.test.js
diff --git a/test/cookies_test.js b/test/cookies.test.js
similarity index 100%
rename from test/cookies_test.js
rename to test/cookies.test.js
diff --git a/test/custom_parameters_test.js b/test/custom_parameters.test.js
similarity index 100%
rename from test/custom_parameters_test.js
rename to test/custom_parameters.test.js
diff --git a/test/dynamic_header_key_test.js b/test/dynamic_header_key.test.js
similarity index 100%
rename from test/dynamic_header_key_test.js
rename to test/dynamic_header_key.test.js
diff --git a/test/dynamic_key_test.js b/test/dynamic_key.test.js
similarity index 100%
rename from test/dynamic_key_test.js
rename to test/dynamic_key.test.js
diff --git a/test/error_func_test.js b/test/error_func.test.js
similarity index 100%
rename from test/error_func_test.js
rename to test/error_func.test.js
diff --git a/test/scheme-response-test.js b/test/scheme-response.test.js
similarity index 100%
rename from test/scheme-response-test.js
rename to test/scheme-response.test.js
diff --git a/test/scopes_test.js b/test/scopes.test.js
similarity index 100%
rename from test/scopes_test.js
rename to test/scopes.test.js
diff --git a/test/url_token_test.js b/test/url_token.test.js
similarity index 100%
rename from test/url_token_test.js
rename to test/url_token.test.js
diff --git a/test/validate_func_test.js b/test/validate_func.test.js
similarity index 100%
rename from test/validate_func_test.js
rename to test/validate_func.test.js
diff --git a/test/verify_func_test.js b/test/verify_func.test.js
similarity index 100%
rename from test/verify_func_test.js
rename to test/verify_func.test.js