diff --git a/package.json b/package.json
index 58b7bcc..e1e76d6 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "tape": "^5.6.3"
   },
   "scripts": {
-    "test": "tape test/*.test.js | tap-arc --bail",
+    "test": "tape 'test/**/*.test.js' | tap-arc --bail",
     "format-code": "prettier --write \"(lib|test)/**/*.js\"",
     "format-code-staged": "pretty-quick --staged --pattern \"(lib|test)/**/*.js\"",
     "coverage": "c8 --reporter=lcov npm run test"
diff --git a/test/feed-v1-create.test.js b/test/feed-v1/feed-v1-create.test.js
similarity index 98%
rename from test/feed-v1-create.test.js
rename to test/feed-v1/feed-v1-create.test.js
index 02cbf67..199cc59 100644
--- a/test/feed-v1-create.test.js
+++ b/test/feed-v1/feed-v1-create.test.js
@@ -1,6 +1,6 @@
 const tape = require('tape')
-const FeedV1 = require('../lib/feed-v1')
-const { generateKeypair } = require('./util')
+const FeedV1 = require('../../lib/feed-v1')
+const { generateKeypair } = require('../util')
 
 let rootMsg = null
 let rootHash = null
diff --git a/test/feed-v1-invalid-prev.test.js b/test/feed-v1/feed-v1-invalid-prev.test.js
similarity index 98%
rename from test/feed-v1-invalid-prev.test.js
rename to test/feed-v1/feed-v1-invalid-prev.test.js
index e183f2d..7ad57cb 100644
--- a/test/feed-v1-invalid-prev.test.js
+++ b/test/feed-v1/feed-v1-invalid-prev.test.js
@@ -1,7 +1,7 @@
 const tape = require('tape')
 const base58 = require('bs58')
-const FeedV1 = require('../lib/feed-v1')
-const { generateKeypair } = require('./util')
+const FeedV1 = require('../../lib/feed-v1')
+const { generateKeypair } = require('../util')
 
 tape('invalid msg with non-array prev', (t) => {
   const keys = generateKeypair('alice')
diff --git a/test/feed-v1-invalid-type.test.js b/test/feed-v1/feed-v1-invalid-type.test.js
similarity index 94%
rename from test/feed-v1-invalid-type.test.js
rename to test/feed-v1/feed-v1-invalid-type.test.js
index b113bed..9776813 100644
--- a/test/feed-v1-invalid-type.test.js
+++ b/test/feed-v1/feed-v1-invalid-type.test.js
@@ -1,6 +1,6 @@
 const tape = require('tape')
-const FeedV1 = require('../lib/feed-v1')
-const { generateKeypair } = require('./util')
+const FeedV1 = require('../../lib/feed-v1')
+const { generateKeypair } = require('../util')
 
 tape('invalid type not a string', (t) => {
   const keys = generateKeypair('alice')
diff --git a/test/feed-v1-lipmaa.test.js b/test/feed-v1/feed-v1-lipmaa.test.js
similarity index 96%
rename from test/feed-v1-lipmaa.test.js
rename to test/feed-v1/feed-v1-lipmaa.test.js
index e2be01d..02a2d45 100644
--- a/test/feed-v1-lipmaa.test.js
+++ b/test/feed-v1/feed-v1-lipmaa.test.js
@@ -1,6 +1,6 @@
 const tape = require('tape')
-const FeedV1 = require('../lib/feed-v1')
-const { generateKeypair } = require('./util')
+const FeedV1 = require('../../lib/feed-v1')
+const { generateKeypair } = require('../util')
 
 tape('lipmaa prevs', (t) => {
   const keys = generateKeypair('alice')
diff --git a/test/feed-v1-tangles.test.js b/test/feed-v1/feed-v1-tangles.test.js
similarity index 97%
rename from test/feed-v1-tangles.test.js
rename to test/feed-v1/feed-v1-tangles.test.js
index 9f6a749..15ad6a2 100644
--- a/test/feed-v1-tangles.test.js
+++ b/test/feed-v1/feed-v1-tangles.test.js
@@ -1,6 +1,6 @@
 const tape = require('tape')
-const FeedV1 = require('../lib/feed-v1')
-const { generateKeypair } = require('./util')
+const FeedV1 = require('../../lib/feed-v1')
+const { generateKeypair } = require('../util')
 
 tape('simple multi-author tangle', (t) => {
   const keysA = generateKeypair('alice')
diff --git a/test/feed-v1-validate.test.js b/test/feed-v1/feed-v1-validate.test.js
similarity index 96%
rename from test/feed-v1-validate.test.js
rename to test/feed-v1/feed-v1-validate.test.js
index b64afc1..edd7d01 100644
--- a/test/feed-v1-validate.test.js
+++ b/test/feed-v1/feed-v1-validate.test.js
@@ -1,7 +1,7 @@
 const tape = require('tape')
 const base58 = require('bs58')
-const FeedV1 = require('../lib/feed-v1')
-const { generateKeypair } = require('./util')
+const FeedV1 = require('../../lib/feed-v1')
+const { generateKeypair } = require('../util')
 
 tape('validate root msg', (t) => {
   const keys = generateKeypair('alice')