diff --git a/package.json b/package.json
index 1e66d7f..805007d 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "files": "test/*.js"
   },
   "scripts": {
-    "test": "./node_modules/.bin/istanbul test ./node_modules/.bin/_mocha -- --reporter list test/*.js",
+    "test": "./node_modules/.bin/istanbul test ./node_modules/.bin/_mocha -- --reporter list `find test -maxdepth 1 -not -type d`",
     "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter list test/*.js",
     "compile": "./node_modules/.bin/browserify ./src/index.js -s Bitcoin | ./node_modules/.bin/uglifyjs > bitcoinjs-min.js"
   },
diff --git a/test/integration.js b/test/integration/p2sh.js
similarity index 100%
rename from test/integration.js
rename to test/integration/p2sh.js
diff --git a/qa/coretests.js b/test/scripts/syncfixtures.js
similarity index 100%
rename from qa/coretests.js
rename to test/scripts/syncfixtures.js