[Pkg-javascript-commits] [node-tap] 96/186: update legacy test fixtures for new folder location

Bastien Roucariès rouca at moszumanska.debian.org
Fri Dec 1 16:40:48 UTC 2017


This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-tap.

commit 75f3a2bf40035940846167e8c20f3be75ecd388e
Author: isaacs <i at izs.me>
Date:   Sat Nov 18 21:53:58 2017 -0800

    update legacy test fixtures for new folder location
---
 bin/run.js                                         |  2 +-
 package.json                                       | 17 ++---
 test-legacy/coverage-checks.js                     | 82 ----------------------
 test-legacy/rcfiles.js                             |  4 +-
 test-legacy/runner-bailout-args.js                 |  4 +-
 test-legacy/runner-dashdash.js                     |  8 ---
 test-legacy/runner-save-file.js                    |  4 +-
 test-legacy/test/assert-at--bail--buffer.tap       |  2 +-
 test-legacy/test/assert-at--bail.tap               |  2 +-
 test-legacy/test/assert-at--buffer.tap             |  8 +--
 test-legacy/test/assert-at.tap                     |  8 +--
 test-legacy/test/assert-todo-skip--buffer.tap      |  4 +-
 test-legacy/test/assert-todo-skip.tap              |  4 +-
 test-legacy/test/bail-child--bail--buffer.tap      |  2 +-
 test-legacy/test/bail-child--bail.tap              |  2 +-
 test-legacy/test/bail-child--buffer.tap            |  2 +-
 test-legacy/test/bail-child.tap                    |  2 +-
 test-legacy/test/bail-fail-spawn--bail--buffer.tap |  4 +-
 test-legacy/test/bail-fail-spawn--bail.tap         |  4 +-
 test-legacy/test/bail-fail-spawn--buffer.tap       |  4 +-
 test-legacy/test/bail-fail-spawn.tap               |  4 +-
 test-legacy/test/bailout--buffer.tap               |  2 +-
 test-legacy/test/bailout.tap                       |  2 +-
 .../before-after-each-promise--bail--buffer.tap    |  2 +-
 .../test/before-after-each-promise--bail.tap       |  2 +-
 .../test/before-after-each-promise--buffer.tap     |  2 +-
 test-legacy/test/before-after-each-promise.tap     |  2 +-
 .../test/before-after-each-raise--bail--buffer.tap |  2 +-
 test-legacy/test/before-after-each-raise--bail.tap |  2 +-
 .../test/before-after-each-raise--buffer.tap       |  2 +-
 test-legacy/test/before-after-each-raise.tap       |  2 +-
 .../test/before-after-each-throw--bail--buffer.tap |  2 +-
 test-legacy/test/before-after-each-throw--bail.tap |  2 +-
 .../test/before-after-each-throw--buffer.tap       |  2 +-
 test-legacy/test/before-after-each-throw.tap       |  2 +-
 test-legacy/test/buffer-yaml--bail--buffer.tap     |  2 +-
 test-legacy/test/buffer-yaml--bail.tap             |  2 +-
 test-legacy/test/buffer-yaml--buffer.tap           |  2 +-
 test-legacy/test/buffer-yaml.tap                   |  2 +-
 .../test/catch-tap-throws--bail--buffer.tap        |  2 +-
 test-legacy/test/catch-tap-throws--bail.tap        |  2 +-
 test-legacy/test/catch-tap-throws--buffer.tap      |  8 +--
 test-legacy/test/catch-tap-throws.tap              |  8 +--
 test-legacy/test/descendant-fail--bail--buffer.tap |  2 +-
 test-legacy/test/descendant-fail--bail.tap         |  2 +-
 test-legacy/test/descendant-fail--buffer.tap       |  2 +-
 test-legacy/test/descendant-fail.tap               |  2 +-
 .../test/does-not-throw-message--bail--buffer.tap  |  2 +-
 test-legacy/test/does-not-throw-message--bail.tap  |  2 +-
 .../test/does-not-throw-message--buffer.tap        |  2 +-
 test-legacy/test/does-not-throw-message.tap        |  2 +-
 test-legacy/test/emitter-match--bail--buffer.tap   |  2 +-
 test-legacy/test/emitter-match--bail.tap           |  2 +-
 test-legacy/test/emitter-match--buffer.tap         |  2 +-
 test-legacy/test/emitter-match.tap                 |  2 +-
 test-legacy/test/end-exception--bail--buffer.tap   |  2 +-
 test-legacy/test/end-exception--bail.tap           |  2 +-
 test-legacy/test/end-exception--buffer.tap         |  2 +-
 test-legacy/test/end-exception.tap                 |  2 +-
 test-legacy/test/equivalent--bail--buffer.tap      |  2 +-
 test-legacy/test/equivalent--bail.tap              |  2 +-
 test-legacy/test/equivalent--buffer.tap            | 12 ++--
 test-legacy/test/equivalent.tap                    | 12 ++--
 test-legacy/test/grep--buffer.tap                  |  4 +-
 test-legacy/test/grep.tap                          |  8 +--
 test-legacy/test/mochalike--bail--buffer.tap       |  2 +-
 test-legacy/test/mochalike--bail.tap               |  2 +-
 test-legacy/test/mochalike--buffer.tap             |  6 +-
 test-legacy/test/mochalike.tap                     |  6 +-
 test-legacy/test/nesting--bail--buffer.tap         |  2 +-
 test-legacy/test/nesting--bail.tap                 |  2 +-
 test-legacy/test/nesting--buffer.tap               |  6 +-
 test-legacy/test/nesting.tap                       |  6 +-
 test-legacy/test/not-ok--bail--buffer.tap          |  2 +-
 test-legacy/test/not-ok--bail.tap                  |  2 +-
 test-legacy/test/not-ok--buffer.tap                |  2 +-
 test-legacy/test/not-ok-nested--bail--buffer.tap   |  2 +-
 test-legacy/test/not-ok-nested--bail.tap           |  2 +-
 test-legacy/test/not-ok-nested--buffer.tap         |  2 +-
 test-legacy/test/not-ok-nested.tap                 |  2 +-
 test-legacy/test/not-ok.tap                        |  2 +-
 test-legacy/test/plan-failures--bail--buffer.tap   |  2 +-
 test-legacy/test/plan-failures--bail.tap           |  2 +-
 test-legacy/test/plan-failures--buffer.tap         | 16 ++---
 test-legacy/test/plan-failures.tap                 | 16 ++---
 test-legacy/test/plan-too-many--bail--buffer.tap   |  2 +-
 test-legacy/test/plan-too-many--bail.tap           |  2 +-
 test-legacy/test/plan-too-many--buffer.tap         |  2 +-
 test-legacy/test/plan-too-many.tap                 |  2 +-
 test-legacy/test/promise-fails--bail--buffer.tap   |  2 +-
 test-legacy/test/promise-fails--bail.tap           |  2 +-
 test-legacy/test/promise-fails--buffer.tap         | 10 +--
 test-legacy/test/promise-fails.tap                 | 10 +--
 test-legacy/test/promise-plan--bail--buffer.tap    |  2 +-
 test-legacy/test/promise-plan--bail.tap            |  2 +-
 test-legacy/test/promise-plan--buffer.tap          |  4 +-
 test-legacy/test/promise-plan.tap                  |  4 +-
 test-legacy/test/promise-return--bail--buffer.tap  |  2 +-
 test-legacy/test/promise-return--bail.tap          |  2 +-
 test-legacy/test/promise-return--buffer.tap        |  2 +-
 .../test/promise-return-mocha--bail--buffer.tap    |  2 +-
 test-legacy/test/promise-return-mocha--bail.tap    |  2 +-
 test-legacy/test/promise-return-mocha--buffer.tap  |  4 +-
 test-legacy/test/promise-return-mocha.tap          |  4 +-
 test-legacy/test/promise-return.tap                |  2 +-
 test-legacy/test/rejects--bail--buffer.tap         |  2 +-
 test-legacy/test/rejects--bail.tap                 |  2 +-
 test-legacy/test/rejects--buffer.tap               | 18 ++---
 test-legacy/test/rejects.tap                       | 18 ++---
 test-legacy/test/source-map-fail--bail--buffer.tap |  2 +-
 test-legacy/test/source-map-fail--bail.tap         |  2 +-
 test-legacy/test/source-map-fail--buffer.tap       |  2 +-
 test-legacy/test/source-map-fail.tap               |  2 +-
 test-legacy/test/sparse-array--bail--buffer.tap    |  2 +-
 test-legacy/test/sparse-array--bail.tap            |  2 +-
 test-legacy/test/sparse-array--buffer.tap          |  4 +-
 test-legacy/test/sparse-array.tap                  |  4 +-
 test-legacy/test/spawn--bail--buffer.tap           |  2 +-
 test-legacy/test/spawn--bail.tap                   |  2 +-
 test-legacy/test/spawn--buffer.tap                 | 12 ++--
 test-legacy/test/spawn-failures--bail--buffer.tap  |  4 +-
 test-legacy/test/spawn-failures--bail.tap          |  4 +-
 test-legacy/test/spawn-failures--buffer.tap        |  8 +--
 test-legacy/test/spawn-failures.tap                | 12 ++--
 test-legacy/test/spawn.tap                         | 12 ++--
 test-legacy/test/stdin--bail--buffer.tap           |  2 +-
 test-legacy/test/stdin--buffer.tap                 |  2 +-
 test-legacy/test/stdin.tap                         |  2 +-
 .../teardown-throw-autocomplete--bail--buffer.tap  |  2 +-
 .../test/teardown-throw-autocomplete--bail.tap     |  2 +-
 .../test/teardown-throw-autocomplete--buffer.tap   |  6 +-
 test-legacy/test/teardown-throw-autocomplete.tap   |  6 +-
 .../test/teardown-timing-throws--bail--buffer.tap  |  2 +-
 test-legacy/test/teardown-timing-throws--bail.tap  |  2 +-
 .../test/teardown-timing-throws--buffer.tap        |  8 +--
 test-legacy/test/teardown-timing-throws.tap        |  8 +--
 test-legacy/test/throw--bail--buffer.tap           |  2 +-
 test-legacy/test/throw--bail.tap                   |  2 +-
 test-legacy/test/throw--buffer.tap                 |  6 +-
 test-legacy/test/throw-root--bail--buffer.tap      |  2 +-
 test-legacy/test/throw-root--bail.tap              |  2 +-
 test-legacy/test/throw-root--buffer.tap            |  2 +-
 test-legacy/test/throw-root.tap                    |  2 +-
 test-legacy/test/throw-twice--bail--buffer.tap     |  2 +-
 test-legacy/test/throw-twice--bail.tap             |  2 +-
 test-legacy/test/throw-twice--buffer.tap           |  4 +-
 test-legacy/test/throw-twice.tap                   |  4 +-
 test-legacy/test/throw.tap                         |  6 +-
 test-legacy/test/throws--bail--buffer.tap          |  2 +-
 test-legacy/test/throws--bail.tap                  |  2 +-
 test-legacy/test/throws--buffer.tap                |  2 +-
 .../test/throws-and-plans--bail--buffer.tap        |  2 +-
 test-legacy/test/throws-and-plans--bail.tap        |  2 +-
 test-legacy/test/throws-and-plans--buffer.tap      | 10 +--
 test-legacy/test/throws-and-plans.tap              | 10 +--
 test-legacy/test/throws.tap                        |  2 +-
 test-legacy/test/type-function--bail--buffer.tap   |  2 +-
 test-legacy/test/type-function--bail.tap           |  2 +-
 test-legacy/test/type-function--buffer.tap         |  6 +-
 test-legacy/test/type-function.tap                 |  6 +-
 test-legacy/test/unfinished--bail--buffer.tap      |  2 +-
 test-legacy/test/unfinished--bail.tap              |  2 +-
 test-legacy/test/unfinished--buffer.tap            |  4 +-
 .../test/unfinished-empty--bail--buffer.tap        |  2 +-
 test-legacy/test/unfinished-empty--bail.tap        |  2 +-
 test-legacy/test/unfinished-empty--buffer.tap      |  2 +-
 test-legacy/test/unfinished-empty.tap              |  2 +-
 .../test/unfinished-promise--bail--buffer.tap      |  2 +-
 test-legacy/test/unfinished-promise--bail.tap      |  2 +-
 test-legacy/test/unfinished-promise--buffer.tap    |  2 +-
 test-legacy/test/unfinished-promise.tap            |  2 +-
 test-legacy/test/unfinished.tap                    |  4 +-
 .../test/unhandled-rejection--bail--buffer.tap     |  2 +-
 test-legacy/test/unhandled-rejection--bail.tap     |  2 +-
 test-legacy/test/unhandled-rejection--buffer.tap   |  2 +-
 test-legacy/test/unhandled-rejection.tap           |  2 +-
 176 files changed, 315 insertions(+), 412 deletions(-)

diff --git a/bin/run.js b/bin/run.js
index d3a47e8..c316491 100755
--- a/bin/run.js
+++ b/bin/run.js
@@ -463,7 +463,7 @@ const pipeToCoverageService = (service, options, child) => {
   if (coverageServiceTest) {
     // test scaffolding.
     // don't actually send stuff to the service
-    bin = require.resolve('../test/fixtures/cat.js')
+    bin = require.resolve('../test-legacy/fixtures/cat.js')
     console.log('%s:%s', service.name, process.env[service.env])
   }
 
diff --git a/package.json b/package.json
index 8040a70..ba09b09 100644
--- a/package.json
+++ b/package.json
@@ -51,11 +51,12 @@
   "license": "ISC",
   "repository": "https://github.com/tapjs/node-tap.git",
   "scripts": {
-    "regen-fixtures": "node scripts/generate-test-test.js test/test/*.js",
+    "regen-fixtures": "node scripts/generate-test-test.js test-legacy/test/*.js",
     "snap": "TAP_SNAPSHOT=1 node bin/run.js test/*.js",
-    "test": "node bin/run.js test/*.js --100 -J",
+    "test": "node bin/run.js test/*.js --100 -J --nyc-arg=--include={lib,bin}",
+    "test-all": "node bin/run.js test/*.js test-legacy/*.js --100 -J --nyc-arg=--include={lib,bin}",
     "unit": "bash scripts/unit.sh",
-    "test-legacy": "node bin/run.js test-legacy/*.* --coverage -t3600 -sfails",
+    "test-legacy": "node bin/run.js test-legacy/*.* --coverage -t3600 --nyc-arg=--include={lib,bin}",
     "smoke": "node bin/run.js --node-arg=test-legacy/test.js test-legacy/test/*.js -j2",
     "posttest": "standard lib test",
     "t": "node bin/run.js test/*.* -sfails.txt",
@@ -70,13 +71,5 @@
   "files": [
     "bin/*",
     "lib/*"
-  ],
-  "config": {
-    "nyc": {
-      "exclude": [
-        "node_modules/**",
-        "test/**"
-      ]
-    }
-  }
+  ]
 }
diff --git a/test-legacy/coverage-checks.js b/test-legacy/coverage-checks.js
deleted file mode 100644
index 8c7491c..0000000
--- a/test-legacy/coverage-checks.js
+++ /dev/null
@@ -1,82 +0,0 @@
-var cp = require('child_process')
-var spawn = cp.spawn
-var exec = cp.execFile
-var node = process.execPath
-var run = require.resolve('../bin/run.js')
-var ok = require.resolve('./test/ok.js')
-var t = require('../')
-
-if (process.version.match(/^v0\.10\./)) {
-  t.plan(0, 'coverage check failure exit does not work on 0.10')
-  process.exit()
-}
-
-t.test('generate some coverage data', function (tt) {
-  spawn(node, [run, ok, '--coverage', '--no-coverage-report'], {
-    stdio: 'ignore'
-  }).on('close', function (code, signal) {
-    tt.equal(code, 0)
-    tt.equal(signal, null)
-    tt.end()
-  })
-})
-
-var passes = [
-  '--lines=1',
-  '--lines=1 --check-coverage',
-  '--lines 1 --statements 1 --functions 1 --branches 1'
-]
-
-var fails = [
-  '--100',
-  '--branches 1', // default lines is 90
-  '--branches=100 --lines=0',
-  '--check-coverage'
-]
-
-var failPattern = new RegExp(
-  'ERROR: Coverage for (lines|branches|statements|functions) ' +
-  '\\([0-9\.]+%\\) ' +
-  'does not meet global threshold \\([0-9]+%\\)'
-)
-var banner =
-'-----------------------|----------|' +
-'----------|----------|----------|----' +
-'------------|\n' +
-'File                   |  % Stmts | ' +
-'% Branch |  % Funcs |  % Lines ' +
-'|Uncovered Lines |\n' +
-'-----------------------|----------|' +
-'----------|----------|----------|----' +
-'------------|\n'
-
-t.test('fails', function (t) {
-  t.plan(fails.length)
-  fails.forEach(function (f) {
-    var args = [run].concat(f.split(' '))
-    t.test(f, function (t) {
-      exec(node, args, { env: {} }, function (err, stdout, stderr) {
-        t.ok(err)
-        t.equal(err.code, 1)
-        t.match(stderr, failPattern)
-        t.match(stdout, banner)
-        t.end()
-      })
-    })
-  })
-})
-
-t.test('passes', function (t) {
-  t.plan(passes.length)
-  passes.forEach(function (p) {
-    t.test(p, function (t) {
-      var args = [run].concat(p.split(' '))
-      exec(node, args, { env: {} }, function (err, stdout, stderr) {
-        t.notOk(err)
-        t.notMatch(stderr, failPattern)
-        t.match(stdout, banner)
-        t.end()
-      })
-    })
-  })
-})
diff --git a/test-legacy/rcfiles.js b/test-legacy/rcfiles.js
index 8248cc7..5696b23 100644
--- a/test-legacy/rcfiles.js
+++ b/test-legacy/rcfiles.js
@@ -72,10 +72,10 @@ function runTest (rcFile, expect) { return function (t) {
 t.test('parseRcFile', function (t) {
   t.test('nonexistent rc file uses defaults', runTest('./does/not/exist', {}))
   t.test('invalid rc file uses defaults',
-         runTest('./test/fixtures/invalid-rc-file.yml', {}))
+         runTest('./test-legacy/fixtures/invalid-rc-file.yml', {}))
 
   t.test('parses when valid yaml',
-    runTest('./test/fixtures/valid-rc-file.yml', {
+    runTest('./test-legacy/fixtures/valid-rc-file.yml', {
       timeout: 9999,
       coverage: false,
       coverageReport: false,
diff --git a/test-legacy/runner-bailout-args.js b/test-legacy/runner-bailout-args.js
index fbfb0ff..28bab3d 100644
--- a/test-legacy/runner-bailout-args.js
+++ b/test-legacy/runner-bailout-args.js
@@ -8,8 +8,8 @@ var ok = require.resolve('./test/ok.js')
 var notok = require.resolve('./test/not-ok.js')
 var colorRe = new RegExp('\u001b\\[[0-9;]+m') // eslint-disable-line
 var bailRe = new RegExp('^Bail out! # this is not ok$', 'm')
-var okre = new RegExp('test[\\\\/]test[/\\\\]ok\\.js \\.+ 10/10( [0-9\.]+m?s)?$', 'm')
-var notokre = new RegExp('test[\\\\/]test[/\\\\]not-ok\\.js \\.+ 0/[12]( [0-9\.]+m?s)?$', 'm')
+var okre = new RegExp('[\\\\/]test[/\\\\]ok\\.js \\.+ 10/10( [0-9\.]+m?s)?$', 'm')
+var notokre = new RegExp('[\\\\/]test[/\\\\]not-ok\\.js \\.+ 0/[12]( [0-9\.]+m?s)?$', 'm')
 var fs = require('fs')
 var which = require('which')
 
diff --git a/test-legacy/runner-dashdash.js b/test-legacy/runner-dashdash.js
index 76ae1e1..8a0dbc9 100644
--- a/test-legacy/runner-dashdash.js
+++ b/test-legacy/runner-dashdash.js
@@ -1,17 +1,9 @@
 var t = require('../')
 var cp = require('child_process')
 var spawn = cp.spawn
-var execFile = cp.execFile
 var node = process.execPath
 var run = require.resolve('../bin/run.js')
 var ok = require.resolve('./test/ok.js')
-var notok = require.resolve('./test/not-ok.js')
-var colorRe = new RegExp('\u001b\\[[0-9;]+m') // eslint-disable-line
-var bailRe = new RegExp('^Bail out! # this is not ok$', 'm')
-var okre = new RegExp('test[\\\\/]test[/\\\\]ok\\.js \\.+ 10/10( [0-9\.]+m?s)?$', 'm')
-var notokre = new RegExp('test[\\\\/]test[/\\\\]not-ok\\.js \\.+ 0/[12]( [0-9\.]+m?s)?$', 'm')
-var fs = require('fs')
-var which = require('which')
 
 t.test('separate filename args with --', function (t) {
   var args = [ run, '--', '-xyz', ok ]
diff --git a/test-legacy/runner-save-file.js b/test-legacy/runner-save-file.js
index 8940a1c..3ffd51f 100644
--- a/test-legacy/runner-save-file.js
+++ b/test-legacy/runner-save-file.js
@@ -8,8 +8,8 @@ var ok = require.resolve('./test/ok.js')
 var notok = require.resolve('./test/not-ok.js')
 var colorRe = new RegExp('\u001b\\[[0-9;]+m') // eslint-disable-line
 var bailRe = new RegExp('^Bail out! # this is not ok$', 'm')
-var okre = new RegExp('test[\\\\/]test[/\\\\]ok\\.js \\.+ 10/10( [0-9\.]+m?s)?$', 'm')
-var notokre = new RegExp('test[\\\\/]test[/\\\\]not-ok\\.js \\.+ 0/[12]( [0-9\.]+m?s)?$', 'm')
+var okre = new RegExp('[\\\\/]test[/\\\\]ok\\.js \\.+ 10/10( [0-9\.]+m?s)?$', 'm')
+var notokre = new RegExp('[\\\\/]test[/\\\\]not-ok\\.js \\.+ 0/[12]( [0-9\.]+m?s)?$', 'm')
 var fs = require('fs')
 var which = require('which')
 var saveFile = 'runner-save-test-' + process.pid
diff --git a/test-legacy/test/assert-at--bail--buffer.tap b/test-legacy/test/assert-at--bail--buffer.tap
index cc91089..b393ff7 100644
--- a/test-legacy/test/assert-at--bail--buffer.tap
+++ b/test-legacy/test/assert-at--bail--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 not ok 1 - foo ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
     
     Bail out! # baz
diff --git a/test-legacy/test/assert-at--bail.tap b/test-legacy/test/assert-at--bail.tap
index d2445be..6ffc160 100644
--- a/test-legacy/test/assert-at--bail.tap
+++ b/test-legacy/test/assert-at--bail.tap
@@ -2,7 +2,7 @@ TAP version 13
 # Subtest: foo
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
     
     Bail out! # baz
diff --git a/test-legacy/test/assert-at--buffer.tap b/test-legacy/test/assert-at--buffer.tap
index ccaee41..f4fbc18 100644
--- a/test-legacy/test/assert-at--buffer.tap
+++ b/test-legacy/test/assert-at--buffer.tap
@@ -2,22 +2,22 @@ TAP version 13
 not ok 1 - foo ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
     
     not ok 2 - bler
       ---
-      {"at":{"column":5,"file":"test/test/assert-at.js","line":25},"source":"t.fail('bler')\n"}
+      {"at":{"column":5,"file":"test-legacy/test/assert-at.js","line":25},"source":"t.fail('bler')\n"}
       ...
     
     not ok 3 - bar
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
     
     not ok 4 - bar stack
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
     
     1..4
diff --git a/test-legacy/test/assert-at.tap b/test-legacy/test/assert-at.tap
index 3a01c33..2791470 100644
--- a/test-legacy/test/assert-at.tap
+++ b/test-legacy/test/assert-at.tap
@@ -2,22 +2,22 @@ TAP version 13
 # Subtest: foo
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
     
     not ok 2 - bler
       ---
-      {"at":{"column":5,"file":"test/test/assert-at.js","line":25},"source":"t.fail('bler')\n"}
+      {"at":{"column":5,"file":"test-legacy/test/assert-at.js","line":25},"source":"t.fail('bler')\n"}
       ...
     
     not ok 3 - bar
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
     
     not ok 4 - bar stack
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test-legacy/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
     
     1..4
diff --git a/test-legacy/test/assert-todo-skip--buffer.tap b/test-legacy/test/assert-todo-skip--buffer.tap
index 4f3817c..449c44c 100644
--- a/test-legacy/test/assert-todo-skip--buffer.tap
+++ b/test-legacy/test/assert-todo-skip--buffer.tap
@@ -5,7 +5,7 @@ ok 1 - not much ___/# time=[0-9.]+(ms)?/~~~ {
     ok 3 - bonus # TODO remove todo directive
     not ok 4 - expected # TODO implement a thing
       ---
-      {"at":{"column":5,"file":"test/test/assert-todo-skip.js","line":7},"source":"t.ok(false, 'expected', {todo: 'implement a thing'})\n"}
+      {"at":{"column":5,"file":"test-legacy/test/assert-todo-skip.js","line":7},"source":"t.ok(false, 'expected', {todo: 'implement a thing'})\n"}
       ...
     
     ok 5 - always passes without explanation # SKIP
@@ -13,7 +13,7 @@ ok 1 - not much ___/# time=[0-9.]+(ms)?/~~~ {
     ok 7 - bonus without explanation # TODO
     not ok 8 - expected without explanation # TODO
       ---
-      {"at":{"column":5,"file":"test/test/assert-todo-skip.js","line":11},"source":"t.ok(false, 'expected without explanation', {todo: true})\n"}
+      {"at":{"column":5,"file":"test-legacy/test/assert-todo-skip.js","line":11},"source":"t.ok(false, 'expected without explanation', {todo: true})\n"}
       ...
     
     1..8
diff --git a/test-legacy/test/assert-todo-skip.tap b/test-legacy/test/assert-todo-skip.tap
index 2ff89e7..3dd6273 100644
--- a/test-legacy/test/assert-todo-skip.tap
+++ b/test-legacy/test/assert-todo-skip.tap
@@ -5,7 +5,7 @@ TAP version 13
     ok 3 - bonus # TODO remove todo directive
     not ok 4 - expected # TODO implement a thing
       ---
-      {"at":{"column":5,"file":"test/test/assert-todo-skip.js","line":7},"source":"t.ok(false, 'expected', {todo: 'implement a thing'})\n"}
+      {"at":{"column":5,"file":"test-legacy/test/assert-todo-skip.js","line":7},"source":"t.ok(false, 'expected', {todo: 'implement a thing'})\n"}
       ...
     
     ok 5 - always passes without explanation # SKIP
@@ -13,7 +13,7 @@ TAP version 13
     ok 7 - bonus without explanation # TODO
     not ok 8 - expected without explanation # TODO
       ---
-      {"at":{"column":5,"file":"test/test/assert-todo-skip.js","line":11},"source":"t.ok(false, 'expected without explanation', {todo: true})\n"}
+      {"at":{"column":5,"file":"test-legacy/test/assert-todo-skip.js","line":11},"source":"t.ok(false, 'expected without explanation', {todo: true})\n"}
       ...
     
     1..8
diff --git a/test-legacy/test/bail-child--bail--buffer.tap b/test-legacy/test/bail-child--bail--buffer.tap
index ae8c03e..dbfe73c 100644
--- a/test-legacy/test/bail-child--bail--buffer.tap
+++ b/test-legacy/test/bail-child--bail--buffer.tap
@@ -3,7 +3,7 @@ not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - failer ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - this fails
           ---
-          {"at":{"column":7,"file":"test/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
           ...
         
         Bail out! # this fails
diff --git a/test-legacy/test/bail-child--bail.tap b/test-legacy/test/bail-child--bail.tap
index fa6a8ba..a37e349 100644
--- a/test-legacy/test/bail-child--bail.tap
+++ b/test-legacy/test/bail-child--bail.tap
@@ -3,7 +3,7 @@ TAP version 13
     # Subtest: failer
         not ok 1 - this fails
           ---
-          {"at":{"column":7,"file":"test/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
           ...
         
         Bail out! # this fails
diff --git a/test-legacy/test/bail-child--buffer.tap b/test-legacy/test/bail-child--buffer.tap
index ae8c03e..dbfe73c 100644
--- a/test-legacy/test/bail-child--buffer.tap
+++ b/test-legacy/test/bail-child--buffer.tap
@@ -3,7 +3,7 @@ not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - failer ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - this fails
           ---
-          {"at":{"column":7,"file":"test/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
           ...
         
         Bail out! # this fails
diff --git a/test-legacy/test/bail-child.tap b/test-legacy/test/bail-child.tap
index fa6a8ba..a37e349 100644
--- a/test-legacy/test/bail-child.tap
+++ b/test-legacy/test/bail-child.tap
@@ -3,7 +3,7 @@ TAP version 13
     # Subtest: failer
         not ok 1 - this fails
           ---
-          {"at":{"column":7,"file":"test/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/bail-child.js","line":7},"source":"t.fail('this fails')\n"}
           ...
         
         Bail out! # this fails
diff --git a/test-legacy/test/bail-fail-spawn--bail--buffer.tap b/test-legacy/test/bail-fail-spawn--bail--buffer.tap
index cba16e0..fcaff95 100644
--- a/test-legacy/test/bail-fail-spawn--bail--buffer.tap
+++ b/test-legacy/test/bail-fail-spawn--bail--buffer.tap
@@ -1,6 +1,6 @@
 TAP version 13
 not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~nesting.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
       ...
@@ -18,7 +18,7 @@ not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
                 
                 Bail out! # nested failure
diff --git a/test-legacy/test/bail-fail-spawn--bail.tap b/test-legacy/test/bail-fail-spawn--bail.tap
index 804b139..4dd4662 100644
--- a/test-legacy/test/bail-fail-spawn--bail.tap
+++ b/test-legacy/test/bail-fail-spawn--bail.tap
@@ -1,6 +1,6 @@
 TAP version 13
 # Subtest: bail fail
-    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/nesting.js
         # Subtest: nesting
             1..2
             # Subtest: first
@@ -14,7 +14,7 @@ TAP version 13
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
                 
                 Bail out! # nested failure
diff --git a/test-legacy/test/bail-fail-spawn--buffer.tap b/test-legacy/test/bail-fail-spawn--buffer.tap
index cba16e0..fcaff95 100644
--- a/test-legacy/test/bail-fail-spawn--buffer.tap
+++ b/test-legacy/test/bail-fail-spawn--buffer.tap
@@ -1,6 +1,6 @@
 TAP version 13
 not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~nesting.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
       ...
@@ -18,7 +18,7 @@ not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
                 
                 Bail out! # nested failure
diff --git a/test-legacy/test/bail-fail-spawn.tap b/test-legacy/test/bail-fail-spawn.tap
index 804b139..4dd4662 100644
--- a/test-legacy/test/bail-fail-spawn.tap
+++ b/test-legacy/test/bail-fail-spawn.tap
@@ -1,6 +1,6 @@
 TAP version 13
 # Subtest: bail fail
-    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/nesting.js
         # Subtest: nesting
             1..2
             # Subtest: first
@@ -14,7 +14,7 @@ TAP version 13
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
                 
                 Bail out! # nested failure
diff --git a/test-legacy/test/bailout--buffer.tap b/test-legacy/test/bailout--buffer.tap
index 3ec7ec6..54bc791 100644
--- a/test-legacy/test/bailout--buffer.tap
+++ b/test-legacy/test/bailout--buffer.tap
@@ -17,7 +17,7 @@ ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
 ok 2 - this passes
 not ok 3 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/bailout.js","line":19},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/bailout.js","line":19},"source":"t.fail('this fails')\n"}
   ...
 
 not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
diff --git a/test-legacy/test/bailout.tap b/test-legacy/test/bailout.tap
index 78ca16c..b0d01b3 100644
--- a/test-legacy/test/bailout.tap
+++ b/test-legacy/test/bailout.tap
@@ -18,7 +18,7 @@ ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~
 ok 2 - this passes
 not ok 3 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/bailout.js","line":19},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/bailout.js","line":19},"source":"t.fail('this fails')\n"}
   ...
 
 # Subtest: async kid
diff --git a/test-legacy/test/before-after-each-promise--bail--buffer.tap b/test-legacy/test/before-after-each-promise--bail--buffer.tap
index 8cafe9e..bdc632c 100644
--- a/test-legacy/test/before-after-each-promise--bail--buffer.tap
+++ b/test-legacy/test/before-after-each-promise--bail--buffer.tap
@@ -15,7 +15,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":23,"file":"test/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":23,"file":"test-legacy/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             Bail out! # this is fine
diff --git a/test-legacy/test/before-after-each-promise--bail.tap b/test-legacy/test/before-after-each-promise--bail.tap
index ac0ce1c..e59445a 100644
--- a/test-legacy/test/before-after-each-promise--bail.tap
+++ b/test-legacy/test/before-after-each-promise--bail.tap
@@ -12,7 +12,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":23,"file":"test/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":23,"file":"test-legacy/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             Bail out! # this is fine
diff --git a/test-legacy/test/before-after-each-promise--buffer.tap b/test-legacy/test/before-after-each-promise--buffer.tap
index 75cead0..1322d3f 100644
--- a/test-legacy/test/before-after-each-promise--buffer.tap
+++ b/test-legacy/test/before-after-each-promise--buffer.tap
@@ -15,7 +15,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":23,"file":"test/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":23,"file":"test-legacy/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             1..2
diff --git a/test-legacy/test/before-after-each-promise.tap b/test-legacy/test/before-after-each-promise.tap
index f576eba..dd9f6ad 100644
--- a/test-legacy/test/before-after-each-promise.tap
+++ b/test-legacy/test/before-after-each-promise.tap
@@ -12,7 +12,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":23,"file":"test/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":23,"file":"test-legacy/test/before-after-each-promise.js","line":28},"source":"return reject(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             1..2
diff --git a/test-legacy/test/before-after-each-raise--bail--buffer.tap b/test-legacy/test/before-after-each-raise--bail--buffer.tap
index b9bd22a..b1a899c 100644
--- a/test-legacy/test/before-after-each-raise--bail--buffer.tap
+++ b/test-legacy/test/before-after-each-raise--bail--buffer.tap
@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test-legacy/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             Bail out! # this is fine
diff --git a/test-legacy/test/before-after-each-raise--bail.tap b/test-legacy/test/before-after-each-raise--bail.tap
index 693d38c..54800bc 100644
--- a/test-legacy/test/before-after-each-raise--bail.tap
+++ b/test-legacy/test/before-after-each-raise--bail.tap
@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test-legacy/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             Bail out! # this is fine
diff --git a/test-legacy/test/before-after-each-raise--buffer.tap b/test-legacy/test/before-after-each-raise--buffer.tap
index 64bfaad..f672add 100644
--- a/test-legacy/test/before-after-each-raise--buffer.tap
+++ b/test-legacy/test/before-after-each-raise--buffer.tap
@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test-legacy/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             1..2
diff --git a/test-legacy/test/before-after-each-raise.tap b/test-legacy/test/before-after-each-raise.tap
index fe75521..ab0ed58 100644
--- a/test-legacy/test/before-after-each-raise.tap
+++ b/test-legacy/test/before-after-each-raise.tap
@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test-legacy/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
             
             1..2
diff --git a/test-legacy/test/before-after-each-throw--bail--buffer.tap b/test-legacy/test/before-after-each-throw--bail--buffer.tap
index b71d9ca..f96f4b7 100644
--- a/test-legacy/test/before-after-each-throw--bail--buffer.tap
+++ b/test-legacy/test/before-after-each-throw--bail--buffer.tap
@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test-legacy/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
             
             Bail out! # this is fine
diff --git a/test-legacy/test/before-after-each-throw--bail.tap b/test-legacy/test/before-after-each-throw--bail.tap
index f660e1a..f306b81 100644
--- a/test-legacy/test/before-after-each-throw--bail.tap
+++ b/test-legacy/test/before-after-each-throw--bail.tap
@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test-legacy/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
             
             Bail out! # this is fine
diff --git a/test-legacy/test/before-after-each-throw--buffer.tap b/test-legacy/test/before-after-each-throw--buffer.tap
index 3dcc596..89ea74f 100644
--- a/test-legacy/test/before-after-each-throw--buffer.tap
+++ b/test-legacy/test/before-after-each-throw--buffer.tap
@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test-legacy/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
             
             1..2
diff --git a/test-legacy/test/before-after-each-throw.tap b/test-legacy/test/before-after-each-throw.tap
index c766d17..1378f83 100644
--- a/test-legacy/test/before-after-each-throw.tap
+++ b/test-legacy/test/before-after-each-throw.tap
@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test-legacy/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
             
             1..2
diff --git a/test-legacy/test/buffer-yaml--bail--buffer.tap b/test-legacy/test/buffer-yaml--bail--buffer.tap
index 103df23..0501ae0 100644
--- a/test-legacy/test/buffer-yaml--bail--buffer.tap
+++ b/test-legacy/test/buffer-yaml--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - should be equivalent
   ---
-  {"at":{"column":3,"file":"test/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74  [...]
+  {"at":{"column":3,"file":"test-legacy/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e [...]
   ...
 
 Bail out! # should be equivalent
diff --git a/test-legacy/test/buffer-yaml--bail.tap b/test-legacy/test/buffer-yaml--bail.tap
index 103df23..0501ae0 100644
--- a/test-legacy/test/buffer-yaml--bail.tap
+++ b/test-legacy/test/buffer-yaml--bail.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - should be equivalent
   ---
-  {"at":{"column":3,"file":"test/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74  [...]
+  {"at":{"column":3,"file":"test-legacy/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e [...]
   ...
 
 Bail out! # should be equivalent
diff --git a/test-legacy/test/buffer-yaml--buffer.tap b/test-legacy/test/buffer-yaml--buffer.tap
index 1e55f5b..9e47ef4 100644
--- a/test-legacy/test/buffer-yaml--buffer.tap
+++ b/test-legacy/test/buffer-yaml--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - should be equivalent
   ---
-  {"at":{"column":3,"file":"test/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74  [...]
+  {"at":{"column":3,"file":"test-legacy/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e [...]
   ...
 
 1..1
diff --git a/test-legacy/test/buffer-yaml.tap b/test-legacy/test/buffer-yaml.tap
index 1e55f5b..9e47ef4 100644
--- a/test-legacy/test/buffer-yaml.tap
+++ b/test-legacy/test/buffer-yaml.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - should be equivalent
   ---
-  {"at":{"column":3,"file":"test/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74  [...]
+  {"at":{"column":3,"file":"test-legacy/test/buffer-yaml.js","line":5},"found":"Buffer\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f\n74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20\n6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b\n6e 6f 74 20 6f 6b 6e 6f 74 20 6f 6b 6e [...]
   ...
 
 1..1
diff --git a/test-legacy/test/catch-tap-throws--bail--buffer.tap b/test-legacy/test/catch-tap-throws--bail--buffer.tap
index ecfe582..d1cbe53 100644
--- a/test-legacy/test/catch-tap-throws--bail--buffer.tap
+++ b/test-legacy/test/catch-tap-throws--bail--buffer.tap
@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test-legacy/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21
diff --git a/test-legacy/test/catch-tap-throws--bail.tap b/test-legacy/test/catch-tap-throws--bail.tap
index eadf374..225bd7f 100644
--- a/test-legacy/test/catch-tap-throws--bail.tap
+++ b/test-legacy/test/catch-tap-throws--bail.tap
@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test-legacy/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21
diff --git a/test-legacy/test/catch-tap-throws--buffer.tap b/test-legacy/test/catch-tap-throws--buffer.tap
index b921e76..ac38c50 100644
--- a/test-legacy/test/catch-tap-throws--buffer.tap
+++ b/test-legacy/test/catch-tap-throws--buffer.tap
@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test-legacy/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21
@@ -54,7 +54,7 @@ ok 7 - assert_after_end_sync ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 8 - test after end() was called
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
+  {"at":{"column":7,"file":"test-legacy/test/catch-tap-throws.js","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
   ...
 
 61
@@ -68,7 +68,7 @@ ok 9 - assert_after_end_async ___/# time=[0-9.]+(ms)?/~~~ {
 23
 not ok 10 - test count exceeds plan ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":9,"file":"test/test/catch-tap-throws.js","line":28},"plan":1,"source":"t.pass(4)\n","test":"exceed_plan_async"}
+  {"at":{"column":9,"file":"test-legacy/test/catch-tap-throws.js","line":28},"plan":1,"source":"t.pass(4)\n","test":"exceed_plan_async"}
   ...
 
 24
@@ -82,7 +82,7 @@ not ok 11 - test end() method called more than once ___/# time=[0-9.]+(ms)?/~~~
 63
 not ok 12 - test after end() was called ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":9,"file":"test/test/catch-tap-throws.js","line":91},"plan":1,"source":"t.pass(10)\n","test":"assert_after_end_async"}
+  {"at":{"column":9,"file":"test-legacy/test/catch-tap-throws.js","line":91},"plan":1,"source":"t.pass(10)\n","test":"assert_after_end_async"}
   ...
 
 64
diff --git a/test-legacy/test/catch-tap-throws.tap b/test-legacy/test/catch-tap-throws.tap
index 3f4be5d..e6d4cf3 100644
--- a/test-legacy/test/catch-tap-throws.tap
+++ b/test-legacy/test/catch-tap-throws.tap
@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test-legacy/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21
@@ -54,7 +54,7 @@ ok 7 - assert_after_end_sync ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 8 - test after end() was called
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
+  {"at":{"column":7,"file":"test-legacy/test/catch-tap-throws.js","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
   ...
 
 61
@@ -68,7 +68,7 @@ ok 9 - assert_after_end_async ___/# time=[0-9.]+(ms)?/~~~
 23
 not ok 10 - test count exceeds plan ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":9,"file":"test/test/catch-tap-throws.js","line":28},"plan":1,"source":"t.pass(4)\n","test":"exceed_plan_async"}
+  {"at":{"column":9,"file":"test-legacy/test/catch-tap-throws.js","line":28},"plan":1,"source":"t.pass(4)\n","test":"exceed_plan_async"}
   ...
 
 24
@@ -82,7 +82,7 @@ not ok 11 - test end() method called more than once ___/# time=[0-9.]+(ms)?/~~~
 63
 not ok 12 - test after end() was called ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":9,"file":"test/test/catch-tap-throws.js","line":91},"plan":1,"source":"t.pass(10)\n","test":"assert_after_end_async"}
+  {"at":{"column":9,"file":"test-legacy/test/catch-tap-throws.js","line":91},"plan":1,"source":"t.pass(10)\n","test":"assert_after_end_async"}
   ...
 
 64
diff --git a/test-legacy/test/descendant-fail--bail--buffer.tap b/test-legacy/test/descendant-fail--bail--buffer.tap
index 0b70d8c..29bae44 100644
--- a/test-legacy/test/descendant-fail--bail--buffer.tap
+++ b/test-legacy/test/descendant-fail--bail--buffer.tap
@@ -6,7 +6,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - nope
           ---
-          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
           ...
         
         Bail out! # nope
diff --git a/test-legacy/test/descendant-fail--bail.tap b/test-legacy/test/descendant-fail--bail.tap
index 0b88e8f..487c1c7 100644
--- a/test-legacy/test/descendant-fail--bail.tap
+++ b/test-legacy/test/descendant-fail--bail.tap
@@ -6,7 +6,7 @@ TAP version 13
         1..1
         not ok 1 - nope
           ---
-          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
           ...
         
         Bail out! # nope
diff --git a/test-legacy/test/descendant-fail--buffer.tap b/test-legacy/test/descendant-fail--buffer.tap
index 623a717..ff61b01 100644
--- a/test-legacy/test/descendant-fail--buffer.tap
+++ b/test-legacy/test/descendant-fail--buffer.tap
@@ -6,7 +6,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - nope
           ---
-          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
           ...
         
         # failed 1 test
diff --git a/test-legacy/test/descendant-fail.tap b/test-legacy/test/descendant-fail.tap
index 0b2ad6d..ab86962 100644
--- a/test-legacy/test/descendant-fail.tap
+++ b/test-legacy/test/descendant-fail.tap
@@ -6,7 +6,7 @@ TAP version 13
         1..1
         not ok 1 - nope
           ---
-          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
           ...
         
         # failed 1 test
diff --git a/test-legacy/test/does-not-throw-message--bail--buffer.tap b/test-legacy/test/does-not-throw-message--bail--buffer.tap
index 80df935..4666458 100644
--- a/test-legacy/test/does-not-throw-message--bail--buffer.tap
+++ b/test-legacy/test/does-not-throw-message--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - expected to not throw
   ---
-  {"at":{"column":9,"file":"test/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
+  {"at":{"column":9,"file":"test-legacy/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
   ...
 
 Bail out! # expected to not throw
diff --git a/test-legacy/test/does-not-throw-message--bail.tap b/test-legacy/test/does-not-throw-message--bail.tap
index 80df935..4666458 100644
--- a/test-legacy/test/does-not-throw-message--bail.tap
+++ b/test-legacy/test/does-not-throw-message--bail.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - expected to not throw
   ---
-  {"at":{"column":9,"file":"test/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
+  {"at":{"column":9,"file":"test-legacy/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
   ...
 
 Bail out! # expected to not throw
diff --git a/test-legacy/test/does-not-throw-message--buffer.tap b/test-legacy/test/does-not-throw-message--buffer.tap
index 4cf41b9..4869270 100644
--- a/test-legacy/test/does-not-throw-message--buffer.tap
+++ b/test-legacy/test/does-not-throw-message--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - expected to not throw
   ---
-  {"at":{"column":9,"file":"test/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
+  {"at":{"column":9,"file":"test-legacy/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
   ...
 
 1..1
diff --git a/test-legacy/test/does-not-throw-message.tap b/test-legacy/test/does-not-throw-message.tap
index 4cf41b9..4869270 100644
--- a/test-legacy/test/does-not-throw-message.tap
+++ b/test-legacy/test/does-not-throw-message.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - expected to not throw
   ---
-  {"at":{"column":9,"file":"test/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
+  {"at":{"column":9,"file":"test-legacy/test/does-not-throw-message.js","line":3},"message":"this is a type of error","source":"throw new TypeError('this is a type of error')\n","type":"TypeError"}
   ...
 
 1..1
diff --git a/test-legacy/test/emitter-match--bail--buffer.tap b/test-legacy/test/emitter-match--bail--buffer.tap
index 0b4ceb0..50d8777 100644
--- a/test-legacy/test/emitter-match--bail--buffer.tap
+++ b/test-legacy/test/emitter-match--bail--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 not ok 1 - check ee matches ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - should match pattern provided
       ---
-      {"at":{"column":5,"file":"test/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
+      {"at":{"column":5,"file":"test-legacy/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
       ...
     
     Bail out! # should match pattern provided
diff --git a/test-legacy/test/emitter-match--bail.tap b/test-legacy/test/emitter-match--bail.tap
index 94859d4..d551904 100644
--- a/test-legacy/test/emitter-match--bail.tap
+++ b/test-legacy/test/emitter-match--bail.tap
@@ -2,7 +2,7 @@ TAP version 13
 # Subtest: check ee matches
     not ok 1 - should match pattern provided
       ---
-      {"at":{"column":5,"file":"test/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
+      {"at":{"column":5,"file":"test-legacy/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
       ...
     
     Bail out! # should match pattern provided
diff --git a/test-legacy/test/emitter-match--buffer.tap b/test-legacy/test/emitter-match--buffer.tap
index 009846c..8f75ded 100644
--- a/test-legacy/test/emitter-match--buffer.tap
+++ b/test-legacy/test/emitter-match--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 not ok 1 - check ee matches ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - should match pattern provided
       ---
-      {"at":{"column":5,"file":"test/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
+      {"at":{"column":5,"file":"test-legacy/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
       ...
     
     1..1
diff --git a/test-legacy/test/emitter-match.tap b/test-legacy/test/emitter-match.tap
index 5f74338..87afa13 100644
--- a/test-legacy/test/emitter-match.tap
+++ b/test-legacy/test/emitter-match.tap
@@ -2,7 +2,7 @@ TAP version 13
 # Subtest: check ee matches
     not ok 1 - should match pattern provided
       ---
-      {"at":{"column":5,"file":"test/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
+      {"at":{"column":5,"file":"test-legacy/test/emitter-match.js","line":9},"found":{"_events":{},"_eventsCount":0,"_maxListeners":10,"domain":{},"truthy":false},"pattern":{"truthy":true},"source":"t.match(e, { truthy: true })\n"}
       ...
     
     1..1
diff --git a/test-legacy/test/end-exception--bail--buffer.tap b/test-legacy/test/end-exception--bail--buffer.tap
index 794ae3f..97d79eb 100644
--- a/test-legacy/test/end-exception--bail--buffer.tap
+++ b/test-legacy/test/end-exception--bail--buffer.tap
@@ -7,7 +7,7 @@ ok 1 ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
+  {"at":{"column":11,"file":"test-legacy/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
   ...
 
 Bail out! # beep
diff --git a/test-legacy/test/end-exception--bail.tap b/test-legacy/test/end-exception--bail.tap
index 37b535a..dbe42b8 100644
--- a/test-legacy/test/end-exception--bail.tap
+++ b/test-legacy/test/end-exception--bail.tap
@@ -7,7 +7,7 @@ ok 1 ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
+  {"at":{"column":11,"file":"test-legacy/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
   ...
 
 Bail out! # beep
diff --git a/test-legacy/test/end-exception--buffer.tap b/test-legacy/test/end-exception--buffer.tap
index 35486e6..1431136 100644
--- a/test-legacy/test/end-exception--buffer.tap
+++ b/test-legacy/test/end-exception--buffer.tap
@@ -7,7 +7,7 @@ ok 1 ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
+  {"at":{"column":11,"file":"test-legacy/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
   ...
 
 1..2
diff --git a/test-legacy/test/end-exception.tap b/test-legacy/test/end-exception.tap
index a3d84a9..c498058 100644
--- a/test-legacy/test/end-exception.tap
+++ b/test-legacy/test/end-exception.tap
@@ -7,7 +7,7 @@ ok 1 ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
+  {"at":{"column":11,"file":"test-legacy/test/end-exception.js","line":8},"source":"throw new Error('beep')\n"}
   ...
 
 1..2
diff --git a/test-legacy/test/equivalent--bail--buffer.tap b/test-legacy/test/equivalent--bail--buffer.tap
index 4e4f668..2a1de7a 100644
--- a/test-legacy/test/equivalent--bail--buffer.tap
+++ b/test-legacy/test/equivalent--bail--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 not ok 1 - child test ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
       ...
     
     Bail out! # should be equal
diff --git a/test-legacy/test/equivalent--bail.tap b/test-legacy/test/equivalent--bail.tap
index 9b31445..642f855 100644
--- a/test-legacy/test/equivalent--bail.tap
+++ b/test-legacy/test/equivalent--bail.tap
@@ -2,7 +2,7 @@ TAP version 13
 # Subtest: child test
     not ok 1 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
       ...
     
     Bail out! # should be equal
diff --git a/test-legacy/test/equivalent--buffer.tap b/test-legacy/test/equivalent--buffer.tap
index f6bb0f2..32ab385 100644
--- a/test-legacy/test/equivalent--buffer.tap
+++ b/test-legacy/test/equivalent--buffer.tap
@@ -2,32 +2,32 @@ TAP version 13
 not ok 1 - child test ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
       ...
     
     not ok 2 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":4},"compare":"===","found":"foo","source":"t.equal('foo', 'foople')\n","wanted":"foople"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":4},"compare":"===","found":"foo","source":"t.equal('foo', 'foople')\n","wanted":"foople"}
       ...
     
     not ok 3 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":5},"compare":"===","found":1,"source":"t.equal(1, '1')\n","wanted":"1"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":5},"compare":"===","found":1,"source":"t.equal(1, '1')\n","wanted":"1"}
       ...
     
     not ok 4 - should be equivalent
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":6},"found":{"bar":1,"extra":9,"foo":"bar"},"source":"t.same({ foo: 'bar', bar: 1, extra: 9 }, { bar: 1, foo: 'baz', missing: true })\n","wanted":{"bar":1,"foo":"baz","missing":true}}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":6},"found":{"bar":1,"extra":9,"foo":"bar"},"source":"t.same({ foo: 'bar', bar: 1, extra: 9 }, { bar: 1, foo: 'baz', missing: true })\n","wanted":{"bar":1,"foo":"baz","missing":true}}
       ...
     
     not ok 5 - should be equivalent
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":7},"found":{"bar":1,"extra":9,"foo":"bar","foop":2},"source":"t.same({ foop: 2, foo: 'bar', bar: 1, extra: 9 },\n","wanted":{"bar":1,"foo":"baz","foop":2,"missing":true}}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":7},"found":{"bar":1,"extra":9,"foo":"bar","foop":2},"source":"t.same({ foop: 2, foo: 'bar', bar: 1, extra: 9 },\n","wanted":{"bar":1,"foo":"baz","foop":2,"missing":true}}
       ...
     
     not ok 6 - should be equivalent
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":9},"found":{"bar":1,"extra":9,"foo":"baz","prop":1,"x":[1,2]},"source":"t.same({ foo: 'baz', bar: 1, extra: 9, x: [1, 2], prop: 1 }, { prop: 1, bar: 1, foo: 'baz', missing: true, x: [1, 2], z: 1 })\n","wanted":{"bar":1,"foo":"baz","missing":true,"prop":1,"x":[1,2],"z":1}}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":9},"found":{"bar":1,"extra":9,"foo":"baz","prop":1,"x":[1,2]},"source":"t.same({ foo: 'baz', bar: 1, extra: 9, x: [1, 2], prop: 1 }, { prop: 1, bar: 1, foo: 'baz', missing: true, x: [1, 2], z: 1 })\n","wanted":{"bar":1,"foo":"baz","missing":true,"prop":1,"x":[1,2],"z":1}}
       ...
     
     1..6
diff --git a/test-legacy/test/equivalent.tap b/test-legacy/test/equivalent.tap
index 98f8926..63e3a50 100644
--- a/test-legacy/test/equivalent.tap
+++ b/test-legacy/test/equivalent.tap
@@ -2,32 +2,32 @@ TAP version 13
 # Subtest: child test
     not ok 1 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":3},"compare":"===","found":"foo\nbaz\nbar\n","source":"t.equal('foo\\nbaz\\nbar\\n', 'foo\\nblerb\\nbar\\n')\n","wanted":"foo\nblerb\nbar\n"}
       ...
     
     not ok 2 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":4},"compare":"===","found":"foo","source":"t.equal('foo', 'foople')\n","wanted":"foople"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":4},"compare":"===","found":"foo","source":"t.equal('foo', 'foople')\n","wanted":"foople"}
       ...
     
     not ok 3 - should be equal
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":5},"compare":"===","found":1,"source":"t.equal(1, '1')\n","wanted":"1"}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":5},"compare":"===","found":1,"source":"t.equal(1, '1')\n","wanted":"1"}
       ...
     
     not ok 4 - should be equivalent
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":6},"found":{"bar":1,"extra":9,"foo":"bar"},"source":"t.same({ foo: 'bar', bar: 1, extra: 9 }, { bar: 1, foo: 'baz', missing: true })\n","wanted":{"bar":1,"foo":"baz","missing":true}}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":6},"found":{"bar":1,"extra":9,"foo":"bar"},"source":"t.same({ foo: 'bar', bar: 1, extra: 9 }, { bar: 1, foo: 'baz', missing: true })\n","wanted":{"bar":1,"foo":"baz","missing":true}}
       ...
     
     not ok 5 - should be equivalent
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":7},"found":{"bar":1,"extra":9,"foo":"bar","foop":2},"source":"t.same({ foop: 2, foo: 'bar', bar: 1, extra: 9 },\n","wanted":{"bar":1,"foo":"baz","foop":2,"missing":true}}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":7},"found":{"bar":1,"extra":9,"foo":"bar","foop":2},"source":"t.same({ foop: 2, foo: 'bar', bar: 1, extra: 9 },\n","wanted":{"bar":1,"foo":"baz","foop":2,"missing":true}}
       ...
     
     not ok 6 - should be equivalent
       ---
-      {"at":{"column":5,"file":"test/test/equivalent.js","line":9},"found":{"bar":1,"extra":9,"foo":"baz","prop":1,"x":[1,2]},"source":"t.same({ foo: 'baz', bar: 1, extra: 9, x: [1, 2], prop: 1 }, { prop: 1, bar: 1, foo: 'baz', missing: true, x: [1, 2], z: 1 })\n","wanted":{"bar":1,"foo":"baz","missing":true,"prop":1,"x":[1,2],"z":1}}
+      {"at":{"column":5,"file":"test-legacy/test/equivalent.js","line":9},"found":{"bar":1,"extra":9,"foo":"baz","prop":1,"x":[1,2]},"source":"t.same({ foo: 'baz', bar: 1, extra: 9, x: [1, 2], prop: 1 }, { prop: 1, bar: 1, foo: 'baz', missing: true, x: [1, 2], z: 1 })\n","wanted":{"bar":1,"foo":"baz","missing":true,"prop":1,"x":[1,2],"z":1}}
       ...
     
     1..6
diff --git a/test-legacy/test/grep--buffer.tap b/test-legacy/test/grep--buffer.tap
index 42e5340..16543ae 100644
--- a/test-legacy/test/grep--buffer.tap
+++ b/test-legacy/test/grep--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test-legacy/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - ___/.*/~~~ok.js ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
             1..2
@@ -27,7 +27,7 @@ ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --gre
     ___/# time=[0-9.]+(ms)?/~~~
 }
 
-ok 2 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
+ok 2 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test-legacy/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - ___/.*/~~~ok.js ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - nesting # SKIP filter out: /nesting/
         ok 2 - this passes
diff --git a/test-legacy/test/grep.tap b/test-legacy/test/grep.tap
index 0988809..265e33a 100644
--- a/test-legacy/test/grep.tap
+++ b/test-legacy/test/grep.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test-legacy/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi
     # Subtest: ___/.*/~~~ok.js
         # Subtest: nesting
             1..2
@@ -25,9 +25,9 @@ TAP version 13
     
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test-legacy/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test-legacy/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi
     # Subtest: ___/.*/~~~ok.js
         ok 1 - nesting # SKIP filter out: /nesting/
         ok 2 - this passes
@@ -46,7 +46,7 @@ ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --gre
     
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 2 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
+ok 2 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test-legacy/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
 
 # invert=false
 # Subtest: a
diff --git a/test-legacy/test/mochalike--bail--buffer.tap b/test-legacy/test/mochalike--bail--buffer.tap
index 4657532..ddd268e 100644
--- a/test-legacy/test/mochalike--bail--buffer.tap
+++ b/test-legacy/test/mochalike--bail--buffer.tap
@@ -53,7 +53,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - has no asserts, only throws ___/# time=[0-9.]+(ms)?/~~~ {
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test-legacy/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
             
             Bail out! # false is not true on line 50
diff --git a/test-legacy/test/mochalike--bail.tap b/test-legacy/test/mochalike--bail.tap
index 66cab2b..3467fd6 100644
--- a/test-legacy/test/mochalike--bail.tap
+++ b/test-legacy/test/mochalike--bail.tap
@@ -53,7 +53,7 @@ ok 4 - reasonably indented things ___/# time=[0-9.]+(ms)?/~~~
         # Subtest: has no asserts, only throws
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test-legacy/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
             
             Bail out! # false is not true on line 50
diff --git a/test-legacy/test/mochalike--buffer.tap b/test-legacy/test/mochalike--buffer.tap
index f6348e2..125dcfa 100644
--- a/test-legacy/test/mochalike--buffer.tap
+++ b/test-legacy/test/mochalike--buffer.tap
@@ -53,7 +53,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - has no asserts, only throws ___/# time=[0-9.]+(ms)?/~~~ {
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test-legacy/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
             
             1..1
@@ -69,7 +69,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 2 - second subset ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - objectify the truthiness
           ---
-          {"actual":false,"at":{"column":5,"file":"test/test/mochalike.js","line":58},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
+          {"actual":false,"at":{"column":5,"file":"test-legacy/test/mochalike.js","line":58},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
           ...
         
         1..1
@@ -84,7 +84,7 @@ not ok 6 - a test passing an error to done() callback ___/# time=[0-9.]+(ms)?/~~
     not ok 1 - is marked as failed ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - error arg
           ---
-          {"at":{"column":12,"file":"test/test/mochalike.js","line":65},"source":"done(new Error('error arg'))\n","test":"is marked as failed"}
+          {"at":{"column":12,"file":"test-legacy/test/mochalike.js","line":65},"source":"done(new Error('error arg'))\n","test":"is marked as failed"}
           ...
         
         1..1
diff --git a/test-legacy/test/mochalike.tap b/test-legacy/test/mochalike.tap
index 3a096d2..02d4ccd 100644
--- a/test-legacy/test/mochalike.tap
+++ b/test-legacy/test/mochalike.tap
@@ -53,7 +53,7 @@ ok 4 - reasonably indented things ___/# time=[0-9.]+(ms)?/~~~
         # Subtest: has no asserts, only throws
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test-legacy/test/mochalike.js","line":52},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
             
             1..1
@@ -69,7 +69,7 @@ ok 4 - reasonably indented things ___/# time=[0-9.]+(ms)?/~~~
     # Subtest: second subset
         not ok 1 - objectify the truthiness
           ---
-          {"actual":false,"at":{"column":5,"file":"test/test/mochalike.js","line":58},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
+          {"actual":false,"at":{"column":5,"file":"test-legacy/test/mochalike.js","line":58},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
           ...
         
         1..1
@@ -84,7 +84,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~
     # Subtest: is marked as failed
         not ok 1 - error arg
           ---
-          {"at":{"column":12,"file":"test/test/mochalike.js","line":65},"source":"done(new Error('error arg'))\n","test":"is marked as failed"}
+          {"at":{"column":12,"file":"test-legacy/test/mochalike.js","line":65},"source":"done(new Error('error arg'))\n","test":"is marked as failed"}
           ...
         
         1..1
diff --git a/test-legacy/test/nesting--bail--buffer.tap b/test-legacy/test/nesting--bail--buffer.tap
index 4c0f313..9a65128 100644
--- a/test-legacy/test/nesting--bail--buffer.tap
+++ b/test-legacy/test/nesting--bail--buffer.tap
@@ -12,7 +12,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
         
         Bail out! # nested failure
diff --git a/test-legacy/test/nesting--bail.tap b/test-legacy/test/nesting--bail.tap
index 80f88da..186d045 100644
--- a/test-legacy/test/nesting--bail.tap
+++ b/test-legacy/test/nesting--bail.tap
@@ -12,7 +12,7 @@ TAP version 13
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
         
         Bail out! # nested failure
diff --git a/test-legacy/test/nesting--buffer.tap b/test-legacy/test/nesting--buffer.tap
index c608733..8ae7367 100644
--- a/test-legacy/test/nesting--buffer.tap
+++ b/test-legacy/test/nesting--buffer.tap
@@ -12,7 +12,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
         
         1..3
@@ -25,7 +25,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
 ok 2 - this passes
 not ok 3 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/nesting.js","line":28},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/nesting.js","line":28},"source":"t.fail('this fails')\n"}
   ...
 
 not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
@@ -33,7 +33,7 @@ not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - second timeout
     not ok 2 - first timeout
       ---
-      {"at":{"column":7,"file":"test/test/nesting.js","line":33,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
+      {"at":{"column":7,"file":"test-legacy/test/nesting.js","line":33,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
       ...
     
     # failed 1 of 2 tests
diff --git a/test-legacy/test/nesting.tap b/test-legacy/test/nesting.tap
index 6ac241b..1bda671 100644
--- a/test-legacy/test/nesting.tap
+++ b/test-legacy/test/nesting.tap
@@ -12,7 +12,7 @@ TAP version 13
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test-legacy/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
         
         1..3
@@ -25,7 +25,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~
 ok 2 - this passes
 not ok 3 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/nesting.js","line":28},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/nesting.js","line":28},"source":"t.fail('this fails')\n"}
   ...
 
 # Subtest: async kid
@@ -33,7 +33,7 @@ not ok 3 - this fails
     ok 1 - second timeout
     not ok 2 - first timeout
       ---
-      {"at":{"column":7,"file":"test/test/nesting.js","line":33,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
+      {"at":{"column":7,"file":"test-legacy/test/nesting.js","line":33,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
       ...
     
     # failed 1 of 2 tests
diff --git a/test-legacy/test/not-ok--bail--buffer.tap b/test-legacy/test/not-ok--bail--buffer.tap
index 337b466..1b85575 100644
--- a/test-legacy/test/not-ok--bail--buffer.tap
+++ b/test-legacy/test/not-ok--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - this is not ok
   ---
-  {"at":{"column":3,"file":"test/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
   ...
 
 Bail out! # this is not ok
diff --git a/test-legacy/test/not-ok--bail.tap b/test-legacy/test/not-ok--bail.tap
index 337b466..1b85575 100644
--- a/test-legacy/test/not-ok--bail.tap
+++ b/test-legacy/test/not-ok--bail.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - this is not ok
   ---
-  {"at":{"column":3,"file":"test/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
   ...
 
 Bail out! # this is not ok
diff --git a/test-legacy/test/not-ok--buffer.tap b/test-legacy/test/not-ok--buffer.tap
index 84b84d3..a624271 100644
--- a/test-legacy/test/not-ok--buffer.tap
+++ b/test-legacy/test/not-ok--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - this is not ok
   ---
-  {"at":{"column":3,"file":"test/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
   ...
 
 1..1
diff --git a/test-legacy/test/not-ok-nested--bail--buffer.tap b/test-legacy/test/not-ok-nested--bail--buffer.tap
index 92d4f9f..281f6a3 100644
--- a/test-legacy/test/not-ok-nested--bail--buffer.tap
+++ b/test-legacy/test/not-ok-nested--bail--buffer.tap
@@ -5,7 +5,7 @@ not ok 1 - gp ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
           ...
         
         Bail out! # fail
diff --git a/test-legacy/test/not-ok-nested--bail.tap b/test-legacy/test/not-ok-nested--bail.tap
index 479b08e..e6e2daa 100644
--- a/test-legacy/test/not-ok-nested--bail.tap
+++ b/test-legacy/test/not-ok-nested--bail.tap
@@ -5,7 +5,7 @@ TAP version 13
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
           ...
         
         Bail out! # fail
diff --git a/test-legacy/test/not-ok-nested--buffer.tap b/test-legacy/test/not-ok-nested--buffer.tap
index 1004756..d5097fd 100644
--- a/test-legacy/test/not-ok-nested--buffer.tap
+++ b/test-legacy/test/not-ok-nested--buffer.tap
@@ -5,7 +5,7 @@ not ok 1 - gp ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
           ...
         
         # failed 1 test
diff --git a/test-legacy/test/not-ok-nested.tap b/test-legacy/test/not-ok-nested.tap
index c79f5c4..fd71d5a 100644
--- a/test-legacy/test/not-ok-nested.tap
+++ b/test-legacy/test/not-ok-nested.tap
@@ -5,7 +5,7 @@ TAP version 13
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
+          {"at":{"column":7,"file":"test-legacy/test/not-ok-nested.js","line":7},"source":"t.fail('fail')\n"}
           ...
         
         # failed 1 test
diff --git a/test-legacy/test/not-ok.tap b/test-legacy/test/not-ok.tap
index 84b84d3..a624271 100644
--- a/test-legacy/test/not-ok.tap
+++ b/test-legacy/test/not-ok.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - this is not ok
   ---
-  {"at":{"column":3,"file":"test/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/not-ok.js","line":3},"source":"t.fail('this is not ok')\n"}
   ...
 
 1..1
diff --git a/test-legacy/test/plan-failures--bail--buffer.tap b/test-legacy/test/plan-failures--bail--buffer.tap
index c28683d..b163952 100644
--- a/test-legacy/test/plan-failures--bail--buffer.tap
+++ b/test-legacy/test/plan-failures--bail--buffer.tap
@@ -6,7 +6,7 @@ ok 1 - pass then pass plan() ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
   ...
 
 Bail out! # test count exceeds plan
diff --git a/test-legacy/test/plan-failures--bail.tap b/test-legacy/test/plan-failures--bail.tap
index fad943c..e13e772 100644
--- a/test-legacy/test/plan-failures--bail.tap
+++ b/test-legacy/test/plan-failures--bail.tap
@@ -6,7 +6,7 @@ ok 1 - pass then pass plan() ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
   ...
 
 Bail out! # test count exceeds plan
diff --git a/test-legacy/test/plan-failures--buffer.tap b/test-legacy/test/plan-failures--buffer.tap
index 635bc67..9855905 100644
--- a/test-legacy/test/plan-failures--buffer.tap
+++ b/test-legacy/test/plan-failures--buffer.tap
@@ -6,7 +6,7 @@ ok 1 - pass then pass plan() ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
   ...
 
 ok 3 - pass then pass end() ___/# time=[0-9.]+(ms)?/~~~ {
@@ -16,7 +16,7 @@ ok 3 - pass then pass end() ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 4 - test after end() was called
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass end()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass end()"}
   ...
 
 ok 5 - pass then fail plan() ___/# time=[0-9.]+(ms)?/~~~ {
@@ -26,7 +26,7 @@ ok 5 - pass then fail plan() ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 6 - test count exceeds plan
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail plan()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail plan()"}
   ...
 
 ok 7 - pass then fail end() ___/# time=[0-9.]+(ms)?/~~~ {
@@ -36,14 +36,14 @@ ok 7 - pass then fail end() ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 8 - test after end() was called
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail end()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail end()"}
   ...
 
 not ok 9 - fail then pass plan() ___/# time=[0-9.]+(ms)?/~~~ {
     1..1
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     # failed 1 test
@@ -52,7 +52,7 @@ not ok 9 - fail then pass plan() ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 10 - fail then pass end() ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     1..1
@@ -63,7 +63,7 @@ not ok 11 - fail then fail plan() ___/# time=[0-9.]+(ms)?/~~~ {
     1..1
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     # failed 1 test
@@ -72,7 +72,7 @@ not ok 11 - fail then fail plan() ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 12 - fail then fail end() ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     1..1
diff --git a/test-legacy/test/plan-failures.tap b/test-legacy/test/plan-failures.tap
index 7259622..0bb8684 100644
--- a/test-legacy/test/plan-failures.tap
+++ b/test-legacy/test/plan-failures.tap
@@ -6,7 +6,7 @@ ok 1 - pass then pass plan() ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass plan()"}
   ...
 
 # Subtest: pass then pass end()
@@ -16,7 +16,7 @@ ok 3 - pass then pass end() ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 4 - test after end() was called
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass end()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then pass end()"}
   ...
 
 # Subtest: pass then fail plan()
@@ -26,7 +26,7 @@ ok 5 - pass then fail plan() ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 6 - test count exceeds plan
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail plan()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail plan()"}
   ...
 
 # Subtest: pass then fail end()
@@ -36,14 +36,14 @@ ok 7 - pass then fail end() ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 8 - test after end() was called
   ---
-  {"at":{"column":12,"file":"test/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail end()"}
+  {"at":{"column":12,"file":"test-legacy/test/plan-failures.js","line":11},"plan":1,"source":"t[second]('extra')\n","test":"pass then fail end()"}
   ...
 
 # Subtest: fail then pass plan()
     1..1
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     # failed 1 test
@@ -52,7 +52,7 @@ not ok 9 - fail then pass plan() ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: fail then pass end()
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     1..1
@@ -63,7 +63,7 @@ not ok 10 - fail then pass end() ___/# time=[0-9.]+(ms)?/~~~
     1..1
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     # failed 1 test
@@ -72,7 +72,7 @@ not ok 11 - fail then fail plan() ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: fail then fail end()
     not ok 1 - ok
       ---
-      {"at":{"column":11,"file":"test/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
+      {"at":{"column":11,"file":"test-legacy/test/plan-failures.js","line":7},"source":"t[first]('ok')\n"}
       ...
     
     1..1
diff --git a/test-legacy/test/plan-too-many--bail--buffer.tap b/test-legacy/test/plan-too-many--bail--buffer.tap
index f063f6f..7d845b6 100644
--- a/test-legacy/test/plan-too-many--bail--buffer.tap
+++ b/test-legacy/test/plan-too-many--bail--buffer.tap
@@ -8,7 +8,7 @@ not ok 1 - children plan too big ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - i am planning big things
         not ok 2 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
+          {"at":{"column":5,"file":"test-legacy/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
           ...
         
         Bail out! # test unfinished
diff --git a/test-legacy/test/plan-too-many--bail.tap b/test-legacy/test/plan-too-many--bail.tap
index 5240766..a7a25d9 100644
--- a/test-legacy/test/plan-too-many--bail.tap
+++ b/test-legacy/test/plan-too-many--bail.tap
@@ -8,7 +8,7 @@ TAP version 13
         ok 1 - i am planning big things
         not ok 2 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
+          {"at":{"column":5,"file":"test-legacy/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
           ...
         
         Bail out! # test unfinished
diff --git a/test-legacy/test/plan-too-many--buffer.tap b/test-legacy/test/plan-too-many--buffer.tap
index c13f5bd..a06bfcd 100644
--- a/test-legacy/test/plan-too-many--buffer.tap
+++ b/test-legacy/test/plan-too-many--buffer.tap
@@ -8,7 +8,7 @@ not ok 1 - children plan too big ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - i am planning big things
         not ok 2 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
+          {"at":{"column":5,"file":"test-legacy/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
           ...
         
         # test count(2) != plan(8)
diff --git a/test-legacy/test/plan-too-many.tap b/test-legacy/test/plan-too-many.tap
index 73a456a..77b7e6a 100644
--- a/test-legacy/test/plan-too-many.tap
+++ b/test-legacy/test/plan-too-many.tap
@@ -8,7 +8,7 @@ TAP version 13
         ok 1 - i am planning big things
         not ok 2 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
+          {"at":{"column":5,"file":"test-legacy/test/plan-too-many.js","line":7},"source":"t.test('grandchild', function (tt) {\n","test":"grandchild"}
           ...
         
         # test count(2) != plan(8)
diff --git a/test-legacy/test/promise-fails--bail--buffer.tap b/test-legacy/test/promise-fails--bail--buffer.tap
index 49a1b3c..380deeb 100644
--- a/test-legacy/test/promise-fails--bail--buffer.tap
+++ b/test-legacy/test/promise-fails--bail--buffer.tap
@@ -5,7 +5,7 @@ not ok 1 - one ___/# time=[0-9.]+(ms)?/~~~ {
             not ok 1 - grandchild of 2 ___/# time=[0-9.]+(ms)?/~~~ {
                 not ok 1 - fail 1
                   ---
-                  {"at":{"column":15,"file":"test/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
+                  {"at":{"column":15,"file":"test-legacy/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
                   ...
                 
                 Bail out! # fail 1
diff --git a/test-legacy/test/promise-fails--bail.tap b/test-legacy/test/promise-fails--bail.tap
index df98d8c..d2005a3 100644
--- a/test-legacy/test/promise-fails--bail.tap
+++ b/test-legacy/test/promise-fails--bail.tap
@@ -5,7 +5,7 @@ TAP version 13
             # Subtest: grandchild of 2
                 not ok 1 - fail 1
                   ---
-                  {"at":{"column":15,"file":"test/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
+                  {"at":{"column":15,"file":"test-legacy/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
                   ...
                 
                 Bail out! # fail 1
diff --git a/test-legacy/test/promise-fails--buffer.tap b/test-legacy/test/promise-fails--buffer.tap
index be9d6b6..ba00072 100644
--- a/test-legacy/test/promise-fails--buffer.tap
+++ b/test-legacy/test/promise-fails--buffer.tap
@@ -5,7 +5,7 @@ not ok 1 - one ___/# time=[0-9.]+(ms)?/~~~ {
             not ok 1 - grandchild of 2 ___/# time=[0-9.]+(ms)?/~~~ {
                 not ok 1 - fail 1
                   ---
-                  {"at":{"column":15,"file":"test/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
+                  {"at":{"column":15,"file":"test-legacy/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
                   ...
                 
                 1..1
@@ -23,7 +23,7 @@ not ok 1 - one ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 2 - second child of 2 ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - fail 2
           ---
-          {"at":{"column":13,"file":"test/test/promise-fails.js","line":12},"source":"throw new Error('fail 2')\n","test":"second child of 2"}
+          {"at":{"column":13,"file":"test-legacy/test/promise-fails.js","line":12},"source":"throw new Error('fail 2')\n","test":"second child of 2"}
           ...
         
         1..1
@@ -37,7 +37,7 @@ not ok 1 - one ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 2 - three ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - fail 3
       ---
-      {"at":{"column":13,"file":"test/test/promise-fails.js","line":18},"source":"throw new Error('fail 3')\n","test":"three"}
+      {"at":{"column":13,"file":"test-legacy/test/promise-fails.js","line":18},"source":"throw new Error('fail 3')\n","test":"three"}
       ...
     
     1..1
@@ -47,7 +47,7 @@ not ok 2 - three ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 3 - some_function_name ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - fail 4
       ---
-      {"at":{"column":15,"file":"test/test/promise-fails.js","line":29},"source":"throw new Error('fail 4')\n","test":"some_function_name"}
+      {"at":{"column":15,"file":"test-legacy/test/promise-fails.js","line":29},"source":"throw new Error('fail 4')\n","test":"some_function_name"}
       ...
     
     1..1
@@ -56,7 +56,7 @@ not ok 3 - some_function_name ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 4 - fail 5
   ---
-  {"at":{"column":9,"file":"test/test/promise-fails.js","line":34},"source":"throw new Error('fail 5')\n","test":"TAP"}
+  {"at":{"column":9,"file":"test-legacy/test/promise-fails.js","line":34},"source":"throw new Error('fail 5')\n","test":"TAP"}
   ...
 
 1..4
diff --git a/test-legacy/test/promise-fails.tap b/test-legacy/test/promise-fails.tap
index fd27d97..ecb2920 100644
--- a/test-legacy/test/promise-fails.tap
+++ b/test-legacy/test/promise-fails.tap
@@ -5,7 +5,7 @@ TAP version 13
             # Subtest: grandchild of 2
                 not ok 1 - fail 1
                   ---
-                  {"at":{"column":15,"file":"test/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
+                  {"at":{"column":15,"file":"test-legacy/test/promise-fails.js","line":7},"source":"throw new Error('fail 1')\n","test":"grandchild of 2"}
                   ...
                 
                 1..1
@@ -23,7 +23,7 @@ TAP version 13
     # Subtest: second child of 2
         not ok 1 - fail 2
           ---
-          {"at":{"column":13,"file":"test/test/promise-fails.js","line":12},"source":"throw new Error('fail 2')\n","test":"second child of 2"}
+          {"at":{"column":13,"file":"test-legacy/test/promise-fails.js","line":12},"source":"throw new Error('fail 2')\n","test":"second child of 2"}
           ...
         
         1..1
@@ -37,7 +37,7 @@ not ok 1 - one ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: three
     not ok 1 - fail 3
       ---
-      {"at":{"column":13,"file":"test/test/promise-fails.js","line":18},"source":"throw new Error('fail 3')\n","test":"three"}
+      {"at":{"column":13,"file":"test-legacy/test/promise-fails.js","line":18},"source":"throw new Error('fail 3')\n","test":"three"}
       ...
     
     1..1
@@ -47,7 +47,7 @@ not ok 2 - three ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: some_function_name
     not ok 1 - fail 4
       ---
-      {"at":{"column":15,"file":"test/test/promise-fails.js","line":29},"source":"throw new Error('fail 4')\n","test":"some_function_name"}
+      {"at":{"column":15,"file":"test-legacy/test/promise-fails.js","line":29},"source":"throw new Error('fail 4')\n","test":"some_function_name"}
       ...
     
     1..1
@@ -56,7 +56,7 @@ not ok 3 - some_function_name ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 4 - fail 5
   ---
-  {"at":{"column":9,"file":"test/test/promise-fails.js","line":34},"source":"throw new Error('fail 5')\n","test":"TAP"}
+  {"at":{"column":9,"file":"test-legacy/test/promise-fails.js","line":34},"source":"throw new Error('fail 5')\n","test":"TAP"}
   ...
 
 1..4
diff --git a/test-legacy/test/promise-plan--bail--buffer.tap b/test-legacy/test/promise-plan--bail--buffer.tap
index dc19c7d..9ec293b 100644
--- a/test-legacy/test/promise-plan--bail--buffer.tap
+++ b/test-legacy/test/promise-plan--bail--buffer.tap
@@ -29,7 +29,7 @@ not ok 4 - broken promises ___/# time=[0-9.]+(ms)?/~~~ {
     
     not ok 2 - wtf
       ---
-      {"at":{"column":13,"file":"test/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
+      {"at":{"column":13,"file":"test-legacy/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
       ...
     
     Bail out! # wtf
diff --git a/test-legacy/test/promise-plan--bail.tap b/test-legacy/test/promise-plan--bail.tap
index f75ee40..280a42f 100644
--- a/test-legacy/test/promise-plan--bail.tap
+++ b/test-legacy/test/promise-plan--bail.tap
@@ -32,7 +32,7 @@ ok 3 - three ___/# time=[0-9.]+(ms)?/~~~
         ok 1 - this is fine
     not ok 2 - wtf
       ---
-      {"at":{"column":13,"file":"test/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
+      {"at":{"column":13,"file":"test-legacy/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
       ...
     
     Bail out! # wtf
diff --git a/test-legacy/test/promise-plan--buffer.tap b/test-legacy/test/promise-plan--buffer.tap
index 6a3f090..388b9f9 100644
--- a/test-legacy/test/promise-plan--buffer.tap
+++ b/test-legacy/test/promise-plan--buffer.tap
@@ -29,7 +29,7 @@ not ok 4 - broken promises ___/# time=[0-9.]+(ms)?/~~~ {
     
     not ok 2 - wtf
       ---
-      {"at":{"column":13,"file":"test/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
+      {"at":{"column":13,"file":"test-legacy/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
       ...
     
     # failed 1 of 2 tests
@@ -44,7 +44,7 @@ not ok 5 - thrown with timeouts ___/# time=[0-9.]+(ms)?/~~~
     not ok 1 - child test left in queue: t.test plan
     not ok 2 - wtf
       ---
-      {"at":{"column":15,"file":"test/test/promise-plan.js","line":63},"source":"throw new Error('wtf')\n","test":"end()"}
+      {"at":{"column":15,"file":"test-legacy/test/promise-plan.js","line":63},"source":"throw new Error('wtf')\n","test":"end()"}
       ...
     
     not ok 3 - test after end() was called
diff --git a/test-legacy/test/promise-plan.tap b/test-legacy/test/promise-plan.tap
index 6a735ee..5a85f27 100644
--- a/test-legacy/test/promise-plan.tap
+++ b/test-legacy/test/promise-plan.tap
@@ -32,7 +32,7 @@ ok 3 - three ___/# time=[0-9.]+(ms)?/~~~
         ok 1 - this is fine
     not ok 2 - wtf
       ---
-      {"at":{"column":13,"file":"test/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
+      {"at":{"column":13,"file":"test-legacy/test/promise-plan.js","line":45},"source":"throw new Error('wtf')\n","test":"end()"}
       ...
     
     # failed 1 of 2 tests
@@ -45,7 +45,7 @@ not ok 4 - broken promises ___/# time=[0-9.]+(ms)?/~~~
     not ok 1 - child test left in queue: t.test plan
     not ok 2 - wtf
       ---
-      {"at":{"column":15,"file":"test/test/promise-plan.js","line":63},"source":"throw new Error('wtf')\n","test":"end()"}
+      {"at":{"column":15,"file":"test-legacy/test/promise-plan.js","line":63},"source":"throw new Error('wtf')\n","test":"end()"}
       ...
     
     not ok 3 - test after end() was called
diff --git a/test-legacy/test/promise-return--bail--buffer.tap b/test-legacy/test/promise-return--bail--buffer.tap
index bb9c94f..4467aa1 100644
--- a/test-legacy/test/promise-return--bail--buffer.tap
+++ b/test-legacy/test/promise-return--bail--buffer.tap
@@ -7,7 +7,7 @@ ok 1 - auto-end on resolve ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 2 - rejected ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expected error
       ---
-      {"at":{"column":34,"file":"test/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+      {"at":{"column":34,"file":"test-legacy/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
       ...
     
     Bail out! # expected error
diff --git a/test-legacy/test/promise-return--bail.tap b/test-legacy/test/promise-return--bail.tap
index d106149..d777c1c 100644
--- a/test-legacy/test/promise-return--bail.tap
+++ b/test-legacy/test/promise-return--bail.tap
@@ -7,7 +7,7 @@ ok 1 - auto-end on resolve ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: rejected
     not ok 1 - expected error
       ---
-      {"at":{"column":34,"file":"test/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+      {"at":{"column":34,"file":"test-legacy/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
       ...
     
     Bail out! # expected error
diff --git a/test-legacy/test/promise-return--buffer.tap b/test-legacy/test/promise-return--buffer.tap
index ca9818f..a43c24e 100644
--- a/test-legacy/test/promise-return--buffer.tap
+++ b/test-legacy/test/promise-return--buffer.tap
@@ -7,7 +7,7 @@ ok 1 - auto-end on resolve ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 2 - rejected ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expected error
       ---
-      {"at":{"column":34,"file":"test/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+      {"at":{"column":34,"file":"test-legacy/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
       ...
     
     1..1
diff --git a/test-legacy/test/promise-return-mocha--bail--buffer.tap b/test-legacy/test/promise-return-mocha--bail--buffer.tap
index df96cb7..2cb568e 100644
--- a/test-legacy/test/promise-return-mocha--bail--buffer.tap
+++ b/test-legacy/test/promise-return-mocha--bail--buffer.tap
@@ -17,7 +17,7 @@ ok 4 - rejected without cb ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 5 - expected error
   ---
-  {"at":{"column":34,"file":"test/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+  {"at":{"column":34,"file":"test-legacy/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
   ...
 
 Bail out! # expected error
diff --git a/test-legacy/test/promise-return-mocha--bail.tap b/test-legacy/test/promise-return-mocha--bail.tap
index 2b8e6c1..1d205da 100644
--- a/test-legacy/test/promise-return-mocha--bail.tap
+++ b/test-legacy/test/promise-return-mocha--bail.tap
@@ -17,7 +17,7 @@ ok 4 - rejected without cb ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 5 - expected error
   ---
-  {"at":{"column":34,"file":"test/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+  {"at":{"column":34,"file":"test-legacy/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
   ...
 
 Bail out! # expected error
diff --git a/test-legacy/test/promise-return-mocha--buffer.tap b/test-legacy/test/promise-return-mocha--buffer.tap
index 6c0b625..c4e1b61 100644
--- a/test-legacy/test/promise-return-mocha--buffer.tap
+++ b/test-legacy/test/promise-return-mocha--buffer.tap
@@ -17,12 +17,12 @@ ok 4 - rejected without cb ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 5 - expected error
   ---
-  {"at":{"column":34,"file":"test/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+  {"at":{"column":34,"file":"test-legacy/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
   ...
 
 not ok 6 - expected error
   ---
-  {"at":{"column":34,"file":"test/test/promise-return-mocha.js","line":37},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected without cb"}
+  {"at":{"column":34,"file":"test-legacy/test/promise-return-mocha.js","line":37},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected without cb"}
   ...
 
 1..6
diff --git a/test-legacy/test/promise-return-mocha.tap b/test-legacy/test/promise-return-mocha.tap
index ee0bf33..966d92c 100644
--- a/test-legacy/test/promise-return-mocha.tap
+++ b/test-legacy/test/promise-return-mocha.tap
@@ -17,12 +17,12 @@ ok 4 - rejected without cb ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 5 - expected error
   ---
-  {"at":{"column":34,"file":"test/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+  {"at":{"column":34,"file":"test-legacy/test/promise-return-mocha.js","line":31},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
   ...
 
 not ok 6 - expected error
   ---
-  {"at":{"column":34,"file":"test/test/promise-return-mocha.js","line":37},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected without cb"}
+  {"at":{"column":34,"file":"test-legacy/test/promise-return-mocha.js","line":37},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected without cb"}
   ...
 
 1..6
diff --git a/test-legacy/test/promise-return.tap b/test-legacy/test/promise-return.tap
index 87a27b5..30fd78d 100644
--- a/test-legacy/test/promise-return.tap
+++ b/test-legacy/test/promise-return.tap
@@ -7,7 +7,7 @@ ok 1 - auto-end on resolve ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: rejected
     not ok 1 - expected error
       ---
-      {"at":{"column":34,"file":"test/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
+      {"at":{"column":34,"file":"test-legacy/test/promise-return.js","line":22},"source":"setTimeout(reject.bind(null, new Error('expected error'), 150))\n","test":"rejected"}
       ...
     
     1..1
diff --git a/test-legacy/test/rejects--bail--buffer.tap b/test-legacy/test/rejects--bail--buffer.tap
index 23435b8..1509627 100644
--- a/test-legacy/test/rejects--bail--buffer.tap
+++ b/test-legacy/test/rejects--bail--buffer.tap
@@ -12,7 +12,7 @@ ok 2 - pwner promise: Error pwn ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 3 - owner promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - owner promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     Bail out! # owner promise: Error own
diff --git a/test-legacy/test/rejects--bail.tap b/test-legacy/test/rejects--bail.tap
index 23435b8..1509627 100644
--- a/test-legacy/test/rejects--bail.tap
+++ b/test-legacy/test/rejects--bail.tap
@@ -12,7 +12,7 @@ ok 2 - pwner promise: Error pwn ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 3 - owner promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - owner promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     Bail out! # owner promise: Error own
diff --git a/test-legacy/test/rejects--buffer.tap b/test-legacy/test/rejects--buffer.tap
index 5c4233d..670bf7d 100644
--- a/test-legacy/test/rejects--buffer.tap
+++ b/test-legacy/test/rejects--buffer.tap
@@ -12,7 +12,7 @@ ok 2 - pwner promise: Error pwn ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 3 - owner promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - owner promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -22,7 +22,7 @@ not ok 3 - owner promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 4 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":22},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":22},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -32,7 +32,7 @@ not ok 4 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 5 - resolved promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - resolved promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":28},"found":10,"source":"t.rejects('resolved promise', function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":28},"found":10,"source":"t.rejects('resolved promise', function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -42,7 +42,7 @@ not ok 5 - resolved promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 6 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":34},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":34},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -62,7 +62,7 @@ ok 8 - expect rejected Promise: Error pwn ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 9 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":52},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":52},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -72,7 +72,7 @@ not ok 9 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 10 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":58},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":58},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -82,7 +82,7 @@ not ok 10 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 11 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":64},"found":10,"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":64},"found":10,"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -92,7 +92,7 @@ not ok 11 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 12 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":70},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":70},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -107,7 +107,7 @@ ok 13 - a ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 14 - b ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - b
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":78},"found":{"message":"foo","name":"Error"},"pattern":{"message":"bar"},"source":"t.rejects(prom, { message: 'bar' }, 'b')\n"}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":78},"found":{"message":"foo","name":"Error"},"pattern":{"message":"bar"},"source":"t.rejects(prom, { message: 'bar' }, 'b')\n"}
       ...
     
     1..1
diff --git a/test-legacy/test/rejects.tap b/test-legacy/test/rejects.tap
index 5c4233d..670bf7d 100644
--- a/test-legacy/test/rejects.tap
+++ b/test-legacy/test/rejects.tap
@@ -12,7 +12,7 @@ ok 2 - pwner promise: Error pwn ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 3 - owner promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - owner promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":16},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects('owner promise', function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -22,7 +22,7 @@ not ok 3 - owner promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 4 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":22},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":22},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -32,7 +32,7 @@ not ok 4 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 5 - resolved promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - resolved promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":28},"found":10,"source":"t.rejects('resolved promise', function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":28},"found":10,"source":"t.rejects('resolved promise', function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -42,7 +42,7 @@ not ok 5 - resolved promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 6 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":34},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":34},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -62,7 +62,7 @@ ok 8 - expect rejected Promise: Error pwn ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 9 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":52},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":52},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -72,7 +72,7 @@ not ok 9 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 10 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":58},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":58},"found":{"message":"pwn","name":"Error"},"pattern":{"message":"own","name":"Error"},"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -82,7 +82,7 @@ not ok 10 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 11 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":64},"found":10,"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":64},"found":10,"source":"t.rejects(function () {\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -92,7 +92,7 @@ not ok 11 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 12 - expect rejected Promise: Error own ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - expect rejected Promise: Error own
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":70},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":70},"found":10,"source":"t.rejects(\n","wanted":{"message":"own","name":"Error"}}
       ...
     
     1..1
@@ -107,7 +107,7 @@ ok 13 - a ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 14 - b ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - b
       ---
-      {"at":{"column":3,"file":"test/test/rejects.js","line":78},"found":{"message":"foo","name":"Error"},"pattern":{"message":"bar"},"source":"t.rejects(prom, { message: 'bar' }, 'b')\n"}
+      {"at":{"column":3,"file":"test-legacy/test/rejects.js","line":78},"found":{"message":"foo","name":"Error"},"pattern":{"message":"bar"},"source":"t.rejects(prom, { message: 'bar' }, 'b')\n"}
       ...
     
     1..1
diff --git a/test-legacy/test/source-map-fail--bail--buffer.tap b/test-legacy/test/source-map-fail--bail--buffer.tap
index 8c3f877..449cd23 100644
--- a/test-legacy/test/source-map-fail--bail--buffer.tap
+++ b/test-legacy/test/source-map-fail--bail--buffer.tap
@@ -5,7 +5,7 @@ not ok 1 - gp ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7},"source":"t.fail 'fail'\n"}
+          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7}}
           ...
         
         Bail out! # fail
diff --git a/test-legacy/test/source-map-fail--bail.tap b/test-legacy/test/source-map-fail--bail.tap
index 1948d9d..97475af 100644
--- a/test-legacy/test/source-map-fail--bail.tap
+++ b/test-legacy/test/source-map-fail--bail.tap
@@ -5,7 +5,7 @@ TAP version 13
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7},"source":"t.fail 'fail'\n"}
+          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7}}
           ...
         
         Bail out! # fail
diff --git a/test-legacy/test/source-map-fail--buffer.tap b/test-legacy/test/source-map-fail--buffer.tap
index 35ee339..3ee5aa0 100644
--- a/test-legacy/test/source-map-fail--buffer.tap
+++ b/test-legacy/test/source-map-fail--buffer.tap
@@ -5,7 +5,7 @@ not ok 1 - gp ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7},"source":"t.fail 'fail'\n"}
+          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7}}
           ...
         
         # failed 1 test
diff --git a/test-legacy/test/source-map-fail.tap b/test-legacy/test/source-map-fail.tap
index c19ed93..2aa6718 100644
--- a/test-legacy/test/source-map-fail.tap
+++ b/test-legacy/test/source-map-fail.tap
@@ -5,7 +5,7 @@ TAP version 13
         1..1
         not ok 1 - fail
           ---
-          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7},"source":"t.fail 'fail'\n"}
+          {"at":{"column":7,"file":"test/test/source-map-fail.coffee","line":7}}
           ...
         
         # failed 1 test
diff --git a/test-legacy/test/sparse-array--bail--buffer.tap b/test-legacy/test/sparse-array--bail--buffer.tap
index 031d40e..9a3be72 100644
--- a/test-legacy/test/sparse-array--bail--buffer.tap
+++ b/test-legacy/test/sparse-array--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - should match pattern provided
   ---
-  {"at":{"column":3,"file":"test/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
+  {"at":{"column":3,"file":"test-legacy/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
   ...
 
 Bail out! # should match pattern provided
diff --git a/test-legacy/test/sparse-array--bail.tap b/test-legacy/test/sparse-array--bail.tap
index 031d40e..9a3be72 100644
--- a/test-legacy/test/sparse-array--bail.tap
+++ b/test-legacy/test/sparse-array--bail.tap
@@ -1,7 +1,7 @@
 TAP version 13
 not ok 1 - should match pattern provided
   ---
-  {"at":{"column":3,"file":"test/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
+  {"at":{"column":3,"file":"test-legacy/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
   ...
 
 Bail out! # should match pattern provided
diff --git a/test-legacy/test/sparse-array--buffer.tap b/test-legacy/test/sparse-array--buffer.tap
index 8c5c426..7ce9b71 100644
--- a/test-legacy/test/sparse-array--buffer.tap
+++ b/test-legacy/test/sparse-array--buffer.tap
@@ -1,12 +1,12 @@
 TAP version 13
 not ok 1 - should match pattern provided
   ---
-  {"at":{"column":3,"file":"test/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
+  {"at":{"column":3,"file":"test-legacy/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
   ...
 
 not ok 2 - should match pattern provided
   ---
-  {"at":{"column":3,"file":"test/test/sparse-array.js","line":4},"found":[1,null,null],"pattern":[1,2,3],"source":"t.similar([1,,,], [1, 2, 3]) // eslint-disable-line\n"}
+  {"at":{"column":3,"file":"test-legacy/test/sparse-array.js","line":4},"found":[1,null,null],"pattern":[1,2,3],"source":"t.similar([1,,,], [1, 2, 3]) // eslint-disable-line\n"}
   ...
 
 1..2
diff --git a/test-legacy/test/sparse-array.tap b/test-legacy/test/sparse-array.tap
index 8c5c426..7ce9b71 100644
--- a/test-legacy/test/sparse-array.tap
+++ b/test-legacy/test/sparse-array.tap
@@ -1,12 +1,12 @@
 TAP version 13
 not ok 1 - should match pattern provided
   ---
-  {"at":{"column":3,"file":"test/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
+  {"at":{"column":3,"file":"test-legacy/test/sparse-array.js","line":3},"found":[1,null,3],"pattern":[1,2,3],"source":"t.similar([1,, 3], [1, 2, 3]) // eslint-disable-line\n"}
   ...
 
 not ok 2 - should match pattern provided
   ---
-  {"at":{"column":3,"file":"test/test/sparse-array.js","line":4},"found":[1,null,null],"pattern":[1,2,3],"source":"t.similar([1,,,], [1, 2, 3]) // eslint-disable-line\n"}
+  {"at":{"column":3,"file":"test-legacy/test/sparse-array.js","line":4},"found":[1,null,null],"pattern":[1,2,3],"source":"t.similar([1,,,], [1, 2, 3]) // eslint-disable-line\n"}
   ...
 
 1..2
diff --git a/test-legacy/test/spawn--bail--buffer.tap b/test-legacy/test/spawn--bail--buffer.tap
index b63b7a6..e263b13 100644
--- a/test-legacy/test/spawn--bail--buffer.tap
+++ b/test-legacy/test/spawn--bail--buffer.tap
@@ -17,7 +17,7 @@ not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(
             ok 2 - this passes
             not ok 3 - nested failure
               ---
-              {"at":{"column":10,"file":"test/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+              {"at":{"column":10,"file":"test-legacy/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
               ...
             
             Bail out! # nested failure
diff --git a/test-legacy/test/spawn--bail.tap b/test-legacy/test/spawn--bail.tap
index 750d42e..e05e4c0 100644
--- a/test-legacy/test/spawn--bail.tap
+++ b/test-legacy/test/spawn--bail.tap
@@ -13,7 +13,7 @@ TAP version 13
             ok 2 - this passes
             not ok 3 - nested failure
               ---
-              {"at":{"column":10,"file":"test/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+              {"at":{"column":10,"file":"test-legacy/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
               ...
             
             Bail out! # nested failure
diff --git a/test-legacy/test/spawn--buffer.tap b/test-legacy/test/spawn--buffer.tap
index c37c711..f02b8f3 100644
--- a/test-legacy/test/spawn--buffer.tap
+++ b/test-legacy/test/spawn--buffer.tap
@@ -17,7 +17,7 @@ not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(
             ok 2 - this passes
             not ok 3 - nested failure
               ---
-              {"at":{"column":10,"file":"test/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+              {"at":{"column":10,"file":"test-legacy/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
               ...
             
             1..3
@@ -30,7 +30,7 @@ not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(
     ok 2 - this passes
     not ok 3 - this fails
       ---
-      {"at":{"column":3,"file":"test/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
+      {"at":{"column":3,"file":"test-legacy/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
       ...
     
     not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
@@ -38,7 +38,7 @@ not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(
         ok 1 - second timeout
         not ok 2 - first timeout
           ---
-          {"at":{"column":7,"file":"test/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
+          {"at":{"column":7,"file":"test-legacy/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
           ...
         
         # failed 1 of 2 tests
@@ -63,7 +63,7 @@ not ok 2 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test-legacy/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
         
         1..3
@@ -76,7 +76,7 @@ not ok 2 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
 ok 3 - this passes
 not ok 4 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
   ...
 
 not ok 5 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
@@ -84,7 +84,7 @@ not ok 5 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - second timeout
     not ok 2 - first timeout
       ---
-      {"at":{"column":7,"file":"test/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
+      {"at":{"column":7,"file":"test-legacy/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
       ...
     
     # failed 1 of 2 tests
diff --git a/test-legacy/test/spawn-failures--bail--buffer.tap b/test-legacy/test/spawn-failures--bail--buffer.tap
index df0141b..4ae0fca 100644
--- a/test-legacy/test/spawn-failures--bail--buffer.tap
+++ b/test-legacy/test/spawn-failures--bail--buffer.tap
@@ -1,6 +1,6 @@
 TAP version 13
 not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
@@ -8,7 +8,7 @@ not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test-legacy/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js"}
           ...
         Bail out! # now is fine
     }
diff --git a/test-legacy/test/spawn-failures--bail.tap b/test-legacy/test/spawn-failures--bail.tap
index 3cc7d06..6ffdb81 100644
--- a/test-legacy/test/spawn-failures--bail.tap
+++ b/test-legacy/test/spawn-failures--bail.tap
@@ -1,10 +1,10 @@
 TAP version 13
 # Subtest: spawn that throws
-    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test-legacy/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js"}
           ...
         Bail out! # now is fine
 Bail out! # now is fine
diff --git a/test-legacy/test/spawn-failures--buffer.tap b/test-legacy/test/spawn-failures--buffer.tap
index 78d8fab..d45d1a1 100644
--- a/test-legacy/test/spawn-failures--buffer.tap
+++ b/test-legacy/test/spawn-failures--buffer.tap
@@ -1,6 +1,6 @@
 TAP version 13
 not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
@@ -8,7 +8,7 @@ not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test-legacy/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js"}
           ...
         1..1
         # failed 1 test
@@ -19,7 +19,7 @@ not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 not ok 2 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
@@ -27,7 +27,7 @@ not ok 2 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
         
         not ok 1 - later is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test/test/spawn-failures.js","line":34},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test-legacy/test/spawn-failures.js","line":34},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js"}
           ...
         1..1
         # failed 1 test
diff --git a/test-legacy/test/spawn-failures.tap b/test-legacy/test/spawn-failures.tap
index 65ffb3b..bf41e84 100644
--- a/test-legacy/test/spawn-failures.tap
+++ b/test-legacy/test/spawn-failures.tap
@@ -1,14 +1,14 @@
 TAP version 13
 # Subtest: spawn that throws
-    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test-legacy/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js"}
           ...
         1..1
         # failed 1 test
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
@@ -18,15 +18,15 @@ TAP version 13
 not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~
 
 # Subtest: spawn that throws
-    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js
         
         not ok 1 - later is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test/test/spawn-failures.js","line":34},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test-legacy/test/spawn-failures.js","line":34},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js"}
           ...
         1..1
         # failed 1 test
-    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test-legacy/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
       {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
diff --git a/test-legacy/test/spawn.tap b/test-legacy/test/spawn.tap
index 9660603..e914d69 100644
--- a/test-legacy/test/spawn.tap
+++ b/test-legacy/test/spawn.tap
@@ -13,7 +13,7 @@ TAP version 13
             ok 2 - this passes
             not ok 3 - nested failure
               ---
-              {"at":{"column":10,"file":"test/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+              {"at":{"column":10,"file":"test-legacy/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
               ...
             
             1..3
@@ -26,7 +26,7 @@ TAP version 13
     ok 2 - this passes
     not ok 3 - this fails
       ---
-      {"at":{"column":3,"file":"test/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
+      {"at":{"column":3,"file":"test-legacy/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
       ...
     
     # Subtest: async kid
@@ -34,7 +34,7 @@ TAP version 13
         ok 1 - second timeout
         not ok 2 - first timeout
           ---
-          {"at":{"column":7,"file":"test/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
+          {"at":{"column":7,"file":"test-legacy/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
           ...
         
         # failed 1 of 2 tests
@@ -62,7 +62,7 @@ not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test-legacy/test/spawn.js","line":18},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
         
         1..3
@@ -75,7 +75,7 @@ not ok 2 - nesting ___/# time=[0-9.]+(ms)?/~~~
 ok 3 - this passes
 not ok 4 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/spawn.js","line":32},"source":"t.fail('this fails')\n"}
   ...
 
 # Subtest: async kid
@@ -83,7 +83,7 @@ not ok 4 - this fails
     ok 1 - second timeout
     not ok 2 - first timeout
       ---
-      {"at":{"column":7,"file":"test/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
+      {"at":{"column":7,"file":"test-legacy/test/spawn.js","line":37,"method":"_onTimeout"},"foo":"blz","source":"t.ok(false, 'first timeout', { foo: 'blz' })\n"}
       ...
     
     # failed 1 of 2 tests
diff --git a/test-legacy/test/stdin--bail--buffer.tap b/test-legacy/test/stdin--bail--buffer.tap
index 83df017..14e0929 100644
--- a/test-legacy/test/stdin--bail--buffer.tap
+++ b/test-legacy/test/stdin--bail--buffer.tap
@@ -26,7 +26,7 @@ ok 1 - fake stdin ___/# time=[0-9.]+(ms)?/~~~ {
 # after
 not ok 2 - /dev/stdin ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":17,"file":"test/test/stdin.js","line":60},"failures":[{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"},{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"}],"source":"p.emit('error', new Error('expect to throw this'))\n","test":"/dev/stdin"}
+  {"at":{"column":17,"file":"test-legacy/test/stdin.js","line":60},"failures":[{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"},{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"}],"source":"p.emit('error', new Error('expect to throw this'))\n","test":"/dev/stdin"}
   ...
 {
     1..3
diff --git a/test-legacy/test/stdin--buffer.tap b/test-legacy/test/stdin--buffer.tap
index c1264ff..71d65d1 100644
--- a/test-legacy/test/stdin--buffer.tap
+++ b/test-legacy/test/stdin--buffer.tap
@@ -26,7 +26,7 @@ ok 1 - fake stdin ___/# time=[0-9.]+(ms)?/~~~ {
 # after
 not ok 2 - /dev/stdin ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":17,"file":"test/test/stdin.js","line":60},"failures":[{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"},{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"}],"source":"p.emit('error', new Error('expect to throw this'))\n","test":"/dev/stdin"}
+  {"at":{"column":17,"file":"test-legacy/test/stdin.js","line":60},"failures":[{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"},{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"}],"source":"p.emit('error', new Error('expect to throw this'))\n","test":"/dev/stdin"}
   ...
 {
     1..3
diff --git a/test-legacy/test/stdin.tap b/test-legacy/test/stdin.tap
index fdebe69..c32e9a8 100644
--- a/test-legacy/test/stdin.tap
+++ b/test-legacy/test/stdin.tap
@@ -41,7 +41,7 @@ ok 1 - fake stdin ___/# time=[0-9.]+(ms)?/~~~
     # failed 2 of 4 tests
 not ok 2 - /dev/stdin ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":17,"file":"test/test/stdin.js","line":60},"failures":[{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"},{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"}],"source":"p.emit('error', new Error('expect to throw this'))\n","test":"/dev/stdin"}
+  {"at":{"column":17,"file":"test-legacy/test/stdin.js","line":60},"failures":[{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"},{"id":4,"name":"expect to throw this","plan":{"end":3,"start":1},"tapError":"id greater than plan end"}],"source":"p.emit('error', new Error('expect to throw this'))\n","test":"/dev/stdin"}
   ...
 
 1..2
diff --git a/test-legacy/test/teardown-throw-autocomplete--bail--buffer.tap b/test-legacy/test/teardown-throw-autocomplete--bail--buffer.tap
index 2f066c2..1ddb6d6 100644
--- a/test-legacy/test/teardown-throw-autocomplete--bail--buffer.tap
+++ b/test-legacy/test/teardown-throw-autocomplete--bail--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 not ok 1 - child ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - test unfinished
       ---
-      {"at":{"column":3,"file":"test/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
+      {"at":{"column":3,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
       ...
     
     Bail out! # test unfinished
diff --git a/test-legacy/test/teardown-throw-autocomplete--bail.tap b/test-legacy/test/teardown-throw-autocomplete--bail.tap
index c1fd11f..8a302de 100644
--- a/test-legacy/test/teardown-throw-autocomplete--bail.tap
+++ b/test-legacy/test/teardown-throw-autocomplete--bail.tap
@@ -2,7 +2,7 @@ TAP version 13
 # Subtest: child
     not ok 1 - test unfinished
       ---
-      {"at":{"column":3,"file":"test/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
+      {"at":{"column":3,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
       ...
     
     Bail out! # test unfinished
diff --git a/test-legacy/test/teardown-throw-autocomplete--buffer.tap b/test-legacy/test/teardown-throw-autocomplete--buffer.tap
index 128eaff..b794490 100644
--- a/test-legacy/test/teardown-throw-autocomplete--buffer.tap
+++ b/test-legacy/test/teardown-throw-autocomplete--buffer.tap
@@ -2,12 +2,12 @@ TAP version 13
 not ok 1 - child ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - test unfinished
       ---
-      {"at":{"column":3,"file":"test/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
+      {"at":{"column":3,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
       ...
     
     not ok 2 - afterEach
       ---
-      {"at":{"column":9,"file":"test/test/teardown-throw-autocomplete.js","line":11},"source":"throw new Error('afterEach')\n","test":"child"}
+      {"at":{"column":9,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":11},"source":"throw new Error('afterEach')\n","test":"child"}
       ...
     
     1..2
@@ -16,7 +16,7 @@ not ok 1 - child ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - child teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-throw-autocomplete.js","line":16},"source":"throw new Error('child teardown')\n","test":"child"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":16},"source":"throw new Error('child teardown')\n","test":"child"}
   ...
 
 1..2
diff --git a/test-legacy/test/teardown-throw-autocomplete.tap b/test-legacy/test/teardown-throw-autocomplete.tap
index b01f8fb..5b430f1 100644
--- a/test-legacy/test/teardown-throw-autocomplete.tap
+++ b/test-legacy/test/teardown-throw-autocomplete.tap
@@ -2,12 +2,12 @@ TAP version 13
 # Subtest: child
     not ok 1 - test unfinished
       ---
-      {"at":{"column":3,"file":"test/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
+      {"at":{"column":3,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":14},"source":"t.test('child', function (t) {\n","test":"child"}
       ...
     
     not ok 2 - afterEach
       ---
-      {"at":{"column":9,"file":"test/test/teardown-throw-autocomplete.js","line":11},"source":"throw new Error('afterEach')\n","test":"child"}
+      {"at":{"column":9,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":11},"source":"throw new Error('afterEach')\n","test":"child"}
       ...
     
     1..2
@@ -16,7 +16,7 @@ not ok 1 - child ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - child teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-throw-autocomplete.js","line":16},"source":"throw new Error('child teardown')\n","test":"child"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-throw-autocomplete.js","line":16},"source":"throw new Error('child teardown')\n","test":"child"}
   ...
 
 1..2
diff --git a/test-legacy/test/teardown-timing-throws--bail--buffer.tap b/test-legacy/test/teardown-timing-throws--bail--buffer.tap
index 6c19984..33c09c6 100644
--- a/test-legacy/test/teardown-timing-throws--bail--buffer.tap
+++ b/test-legacy/test/teardown-timing-throws--bail--buffer.tap
@@ -25,7 +25,7 @@ ok 4 - step4 ___/# time=[0-9.]+(ms)?/~~~ {
 ############## step4 teardown
 not ok 5 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
   ...
 
 Bail out! # ############## step1 teardown
diff --git a/test-legacy/test/teardown-timing-throws--bail.tap b/test-legacy/test/teardown-timing-throws--bail.tap
index 437292b..b654d0c 100644
--- a/test-legacy/test/teardown-timing-throws--bail.tap
+++ b/test-legacy/test/teardown-timing-throws--bail.tap
@@ -25,7 +25,7 @@ ok 4 - step4 ___/# time=[0-9.]+(ms)?/~~~
 ############## step4 teardown
 not ok 5 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
   ...
 
 Bail out! # ############## step1 teardown
diff --git a/test-legacy/test/teardown-timing-throws--buffer.tap b/test-legacy/test/teardown-timing-throws--buffer.tap
index 4fb5771..7befcdd 100644
--- a/test-legacy/test/teardown-timing-throws--buffer.tap
+++ b/test-legacy/test/teardown-timing-throws--buffer.tap
@@ -25,22 +25,22 @@ ok 4 - step4 ___/# time=[0-9.]+(ms)?/~~~ {
 ############## step4 teardown
 not ok 5 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
   ...
 
 not ok 6 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":16},"source":"throw new Error('############## step1 teardown')\n","test":"step2"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":16},"source":"throw new Error('############## step1 teardown')\n","test":"step2"}
   ...
 
 not ok 7 - ############## step3 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":25},"source":"throw new Error('############## step3 teardown')\n","test":"step3"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":25},"source":"throw new Error('############## step3 teardown')\n","test":"step3"}
   ...
 
 not ok 8 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":34},"source":"throw new Error('############## step1 teardown')\n","test":"step4"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":34},"source":"throw new Error('############## step1 teardown')\n","test":"step4"}
   ...
 
 1..8
diff --git a/test-legacy/test/teardown-timing-throws.tap b/test-legacy/test/teardown-timing-throws.tap
index f4b9c90..a95b01c 100644
--- a/test-legacy/test/teardown-timing-throws.tap
+++ b/test-legacy/test/teardown-timing-throws.tap
@@ -25,22 +25,22 @@ ok 4 - step4 ___/# time=[0-9.]+(ms)?/~~~
 ############## step4 teardown
 not ok 5 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":7},"source":"throw new Error('############## step1 teardown')\n","test":"step1"}
   ...
 
 not ok 6 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":16},"source":"throw new Error('############## step1 teardown')\n","test":"step2"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":16},"source":"throw new Error('############## step1 teardown')\n","test":"step2"}
   ...
 
 not ok 7 - ############## step3 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":25},"source":"throw new Error('############## step3 teardown')\n","test":"step3"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":25},"source":"throw new Error('############## step3 teardown')\n","test":"step3"}
   ...
 
 not ok 8 - ############## step1 teardown
   ---
-  {"at":{"column":11,"file":"test/test/teardown-timing-throws.js","line":34},"source":"throw new Error('############## step1 teardown')\n","test":"step4"}
+  {"at":{"column":11,"file":"test-legacy/test/teardown-timing-throws.js","line":34},"source":"throw new Error('############## step1 teardown')\n","test":"step4"}
   ...
 
 1..8
diff --git a/test-legacy/test/throw--bail--buffer.tap b/test-legacy/test/throw--bail--buffer.tap
index 5e39e5c..c4acf42 100644
--- a/test-legacy/test/throw--bail--buffer.tap
+++ b/test-legacy/test/throw--bail--buffer.tap
@@ -10,7 +10,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 2 - async thrower ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - THINK FAST! and also lines so many
           ---
-          {"at":{"column":16,"file":"test/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
+          {"at":{"column":16,"file":"test-legacy/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
           ...
         
         Bail out! # THINK FAST! and also lines so many
diff --git a/test-legacy/test/throw--bail.tap b/test-legacy/test/throw--bail.tap
index b5be10d..02490de 100644
--- a/test-legacy/test/throw--bail.tap
+++ b/test-legacy/test/throw--bail.tap
@@ -10,7 +10,7 @@ TAP version 13
     # Subtest: async thrower
         not ok 1 - THINK FAST! and also lines so many
           ---
-          {"at":{"column":16,"file":"test/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
+          {"at":{"column":16,"file":"test-legacy/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
           ...
         
         Bail out! # THINK FAST! and also lines so many
diff --git a/test-legacy/test/throw--buffer.tap b/test-legacy/test/throw--buffer.tap
index be0c9c9..b09360a 100644
--- a/test-legacy/test/throw--buffer.tap
+++ b/test-legacy/test/throw--buffer.tap
@@ -10,7 +10,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 2 - async thrower ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - THINK FAST! and also lines so many
           ---
-          {"at":{"column":16,"file":"test/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
+          {"at":{"column":16,"file":"test-legacy/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
           ...
         
         1..1
@@ -20,7 +20,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 3 - thrower ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - here hold this for a second
           ---
-          {"at":{"column":14,"file":"test/test/throw.js","line":18},"source":"var er = new Error('here hold this for a second')\n","syscall":"ring ring","test":"thrower"}
+          {"at":{"column":14,"file":"test-legacy/test/throw.js","line":18},"source":"var er = new Error('here hold this for a second')\n","syscall":"ring ring","test":"thrower"}
           ...
         
         1..1
@@ -33,7 +33,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
 ok 2 - this passes
 not ok 3 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/throw.js","line":25},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/throw.js","line":25},"source":"t.fail('this fails')\n"}
   ...
 
 not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
diff --git a/test-legacy/test/throw-root--bail--buffer.tap b/test-legacy/test/throw-root--bail--buffer.tap
index b62a470..86df33f 100644
--- a/test-legacy/test/throw-root--bail--buffer.tap
+++ b/test-legacy/test/throw-root--bail--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 ok 1 - this is fine
 not ok 2 - catch!
   ---
-  {"at":{"column":7,"file":"test/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
+  {"at":{"column":7,"file":"test-legacy/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
   ...
 
 Bail out! # catch!
diff --git a/test-legacy/test/throw-root--bail.tap b/test-legacy/test/throw-root--bail.tap
index b62a470..86df33f 100644
--- a/test-legacy/test/throw-root--bail.tap
+++ b/test-legacy/test/throw-root--bail.tap
@@ -2,7 +2,7 @@ TAP version 13
 ok 1 - this is fine
 not ok 2 - catch!
   ---
-  {"at":{"column":7,"file":"test/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
+  {"at":{"column":7,"file":"test-legacy/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
   ...
 
 Bail out! # catch!
diff --git a/test-legacy/test/throw-root--buffer.tap b/test-legacy/test/throw-root--buffer.tap
index b29942a..a6e1313 100644
--- a/test-legacy/test/throw-root--buffer.tap
+++ b/test-legacy/test/throw-root--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 ok 1 - this is fine
 not ok 2 - catch!
   ---
-  {"at":{"column":7,"file":"test/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
+  {"at":{"column":7,"file":"test-legacy/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
   ...
 
 1..2
diff --git a/test-legacy/test/throw-root.tap b/test-legacy/test/throw-root.tap
index b29942a..a6e1313 100644
--- a/test-legacy/test/throw-root.tap
+++ b/test-legacy/test/throw-root.tap
@@ -2,7 +2,7 @@ TAP version 13
 ok 1 - this is fine
 not ok 2 - catch!
   ---
-  {"at":{"column":7,"file":"test/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
+  {"at":{"column":7,"file":"test-legacy/test/throw-root.js","line":3},"source":"throw new Error('catch!')\n","test":"TAP"}
   ...
 
 1..2
diff --git a/test-legacy/test/throw-twice--bail--buffer.tap b/test-legacy/test/throw-twice--bail--buffer.tap
index 5f13531..87b8b8d 100644
--- a/test-legacy/test/throw-twice--bail--buffer.tap
+++ b/test-legacy/test/throw-twice--bail--buffer.tap
@@ -6,7 +6,7 @@ ok 1 - fine ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - Error: this one ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":20,"file":"test/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
+  {"at":{"column":20,"file":"test-legacy/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
   ...
 
 Bail out! # Error: this one
diff --git a/test-legacy/test/throw-twice--bail.tap b/test-legacy/test/throw-twice--bail.tap
index 0443e67..ce34a00 100644
--- a/test-legacy/test/throw-twice--bail.tap
+++ b/test-legacy/test/throw-twice--bail.tap
@@ -6,7 +6,7 @@ ok 1 - fine ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - Error: this one ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":20,"file":"test/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
+  {"at":{"column":20,"file":"test-legacy/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
   ...
 
 Bail out! # Error: this one
diff --git a/test-legacy/test/throw-twice--buffer.tap b/test-legacy/test/throw-twice--buffer.tap
index 96060ef..ab997dc 100644
--- a/test-legacy/test/throw-twice--buffer.tap
+++ b/test-legacy/test/throw-twice--buffer.tap
@@ -6,12 +6,12 @@ ok 1 - fine ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - Error: this one ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":20,"file":"test/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
+  {"at":{"column":20,"file":"test-legacy/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
   ...
 
 not ok 3 - not this one ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":11,"file":"test/test/throw-twice.js","line":10},"source":"throw new Error('not this one')\n","test":"fine"}
+  {"at":{"column":11,"file":"test-legacy/test/throw-twice.js","line":10},"source":"throw new Error('not this one')\n","test":"fine"}
   ...
 
 1..3
diff --git a/test-legacy/test/throw-twice.tap b/test-legacy/test/throw-twice.tap
index 1a45a11..0067bb2 100644
--- a/test-legacy/test/throw-twice.tap
+++ b/test-legacy/test/throw-twice.tap
@@ -6,12 +6,12 @@ ok 1 - fine ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - Error: this one ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":20,"file":"test/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
+  {"at":{"column":20,"file":"test-legacy/test/throw-twice.js","line":7},"source":"throw { stack: new Error('this one').stack }\n","test":"fine"}
   ...
 
 not ok 3 - not this one ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":11,"file":"test/test/throw-twice.js","line":10},"source":"throw new Error('not this one')\n","test":"fine"}
+  {"at":{"column":11,"file":"test-legacy/test/throw-twice.js","line":10},"source":"throw new Error('not this one')\n","test":"fine"}
   ...
 
 1..3
diff --git a/test-legacy/test/throw.tap b/test-legacy/test/throw.tap
index 37aafcc..511f8c6 100644
--- a/test-legacy/test/throw.tap
+++ b/test-legacy/test/throw.tap
@@ -10,7 +10,7 @@ TAP version 13
     # Subtest: async thrower
         not ok 1 - THINK FAST! and also lines so many
           ---
-          {"at":{"column":16,"file":"test/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
+          {"at":{"column":16,"file":"test-legacy/test/throw.js","line":12},"jerk":true,"source":"var er = new Error('THINK FAST!\\nand also lines\\nso many')\n","test":"async thrower"}
           ...
         
         1..1
@@ -20,7 +20,7 @@ TAP version 13
     # Subtest: thrower
         not ok 1 - here hold this for a second
           ---
-          {"at":{"column":14,"file":"test/test/throw.js","line":18},"source":"var er = new Error('here hold this for a second')\n","syscall":"ring ring","test":"thrower"}
+          {"at":{"column":14,"file":"test-legacy/test/throw.js","line":18},"source":"var er = new Error('here hold this for a second')\n","syscall":"ring ring","test":"thrower"}
           ...
         
         1..1
@@ -33,7 +33,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~
 ok 2 - this passes
 not ok 3 - this fails
   ---
-  {"at":{"column":3,"file":"test/test/throw.js","line":25},"source":"t.fail('this fails')\n"}
+  {"at":{"column":3,"file":"test-legacy/test/throw.js","line":25},"source":"t.fail('this fails')\n"}
   ...
 
 # Subtest: async kid
diff --git a/test-legacy/test/throws--bail--buffer.tap b/test-legacy/test/throws--bail--buffer.tap
index 4f82a23..10df701 100644
--- a/test-legacy/test/throws--bail--buffer.tap
+++ b/test-legacy/test/throws--bail--buffer.tap
@@ -4,7 +4,7 @@ not ok 1 - throws should match a regex ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - passing_thrower
     not ok 2 - failing_thrower
       ---
-      {"at":{"column":5,"file":"test/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
+      {"at":{"column":5,"file":"test-legacy/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
       ...
     
     Bail out! # failing_thrower
diff --git a/test-legacy/test/throws--bail.tap b/test-legacy/test/throws--bail.tap
index 4609501..d580305 100644
--- a/test-legacy/test/throws--bail.tap
+++ b/test-legacy/test/throws--bail.tap
@@ -4,7 +4,7 @@ TAP version 13
     ok 1 - passing_thrower
     not ok 2 - failing_thrower
       ---
-      {"at":{"column":5,"file":"test/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
+      {"at":{"column":5,"file":"test-legacy/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
       ...
     
     Bail out! # failing_thrower
diff --git a/test-legacy/test/throws--buffer.tap b/test-legacy/test/throws--buffer.tap
index a026bac..6ef6c98 100644
--- a/test-legacy/test/throws--buffer.tap
+++ b/test-legacy/test/throws--buffer.tap
@@ -4,7 +4,7 @@ not ok 1 - throws should match a regex ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - passing_thrower
     not ok 2 - failing_thrower
       ---
-      {"at":{"column":5,"file":"test/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
+      {"at":{"column":5,"file":"test-legacy/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
       ...
     
     # failed 1 of 2 tests
diff --git a/test-legacy/test/throws-and-plans--bail--buffer.tap b/test-legacy/test/throws-and-plans--bail--buffer.tap
index 1c8e4af..897c13a 100644
--- a/test-legacy/test/throws-and-plans--bail--buffer.tap
+++ b/test-legacy/test/throws-and-plans--bail--buffer.tap
@@ -9,7 +9,7 @@ not ok 2 - plans of 1 ___/# time=[0-9.]+(ms)?/~~~ {
     
     not ok 3 - pwnSync
       ---
-      {"at":{"column":11,"file":"test/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
+      {"at":{"column":11,"file":"test-legacy/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
       ...
     
     Bail out! # pwnSync
diff --git a/test-legacy/test/throws-and-plans--bail.tap b/test-legacy/test/throws-and-plans--bail.tap
index b043033..0b0bcdb 100644
--- a/test-legacy/test/throws-and-plans--bail.tap
+++ b/test-legacy/test/throws-and-plans--bail.tap
@@ -9,7 +9,7 @@ ok 1 - expect truthy value
     
     not ok 3 - pwnSync
       ---
-      {"at":{"column":11,"file":"test/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
+      {"at":{"column":11,"file":"test-legacy/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
       ...
     
     Bail out! # pwnSync
diff --git a/test-legacy/test/throws-and-plans--buffer.tap b/test-legacy/test/throws-and-plans--buffer.tap
index 4543f1a..d1dec76 100644
--- a/test-legacy/test/throws-and-plans--buffer.tap
+++ b/test-legacy/test/throws-and-plans--buffer.tap
@@ -9,7 +9,7 @@ not ok 2 - plans of 1 ___/# time=[0-9.]+(ms)?/~~~ {
     
     not ok 3 - pwnSync
       ---
-      {"at":{"column":11,"file":"test/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
+      {"at":{"column":11,"file":"test-legacy/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
       ...
     
     ok 4 - async thrower ___/# time=[0-9.]+(ms)?/~~~ {
@@ -27,7 +27,7 @@ not ok 2 - plans of 1 ___/# time=[0-9.]+(ms)?/~~~ {
 not ok 3 - no assert only throw ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - false is truthy right?
       ---
-      {"actual":false,"at":{"column":3,"file":"test/test/throws-and-plans.js","line":29},"expected":true,"generatedMessage":false,"operator":"==","source":"assert(false, 'false is truthy right?')\n","test":"no assert only throw","type":"AssertionError"}
+      {"actual":false,"at":{"column":3,"file":"test-legacy/test/throws-and-plans.js","line":29},"expected":true,"generatedMessage":false,"operator":"==","source":"assert(false, 'false is truthy right?')\n","test":"no assert only throw","type":"AssertionError"}
       ...
     
     1..1
@@ -41,7 +41,7 @@ not ok 4 - plans of 8 ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - before the bomb
         not ok 2 - pwnSync
           ---
-          {"at":{"column":11,"file":"test/test/throws-and-plans.js","line":39},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
+          {"at":{"column":11,"file":"test-legacy/test/throws-and-plans.js","line":39},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
           ...
         
         # test count(2) != plan(8)
@@ -55,7 +55,7 @@ not ok 4 - plans of 8 ___/# time=[0-9.]+(ms)?/~~~ {
         ok 3 - before the bomb
         not ok 4 - pwn
           ---
-          {"at":{"column":13,"file":"test/test/throws-and-plans.js","line":51},"source":"throw new Error('pwn')\n","test":"async thrower"}
+          {"at":{"column":13,"file":"test-legacy/test/throws-and-plans.js","line":51},"source":"throw new Error('pwn')\n","test":"async thrower"}
           ...
         
         # test count(4) != plan(8)
@@ -69,7 +69,7 @@ not ok 4 - plans of 8 ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 5 - pwn ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":13,"file":"test/test/throws-and-plans.js","line":18},"source":"throw new Error('pwn')\n","test":"async thrower"}
+  {"at":{"column":13,"file":"test-legacy/test/throws-and-plans.js","line":18},"source":"throw new Error('pwn')\n","test":"async thrower"}
   ...
 
 1..5
diff --git a/test-legacy/test/throws-and-plans.tap b/test-legacy/test/throws-and-plans.tap
index b146865..2c2ac42 100644
--- a/test-legacy/test/throws-and-plans.tap
+++ b/test-legacy/test/throws-and-plans.tap
@@ -9,7 +9,7 @@ ok 1 - expect truthy value
     
     not ok 3 - pwnSync
       ---
-      {"at":{"column":11,"file":"test/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
+      {"at":{"column":11,"file":"test-legacy/test/throws-and-plans.js","line":10},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
       ...
     
     # Subtest: async thrower
@@ -27,7 +27,7 @@ not ok 2 - plans of 1 ___/# time=[0-9.]+(ms)?/~~~
 # Subtest: no assert only throw
     not ok 1 - false is truthy right?
       ---
-      {"actual":false,"at":{"column":3,"file":"test/test/throws-and-plans.js","line":29},"expected":true,"generatedMessage":false,"operator":"==","source":"assert(false, 'false is truthy right?')\n","test":"no assert only throw","type":"AssertionError"}
+      {"actual":false,"at":{"column":3,"file":"test-legacy/test/throws-and-plans.js","line":29},"expected":true,"generatedMessage":false,"operator":"==","source":"assert(false, 'false is truthy right?')\n","test":"no assert only throw","type":"AssertionError"}
       ...
     
     1..1
@@ -41,7 +41,7 @@ not ok 3 - no assert only throw ___/# time=[0-9.]+(ms)?/~~~
         ok 1 - before the bomb
         not ok 2 - pwnSync
           ---
-          {"at":{"column":11,"file":"test/test/throws-and-plans.js","line":39},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
+          {"at":{"column":11,"file":"test-legacy/test/throws-and-plans.js","line":39},"source":"throw new Error('pwnSync')\n","test":"sync thrower"}
           ...
         
         # test count(2) != plan(8)
@@ -55,7 +55,7 @@ not ok 3 - no assert only throw ___/# time=[0-9.]+(ms)?/~~~
         ok 3 - before the bomb
         not ok 4 - pwn
           ---
-          {"at":{"column":13,"file":"test/test/throws-and-plans.js","line":51},"source":"throw new Error('pwn')\n","test":"async thrower"}
+          {"at":{"column":13,"file":"test-legacy/test/throws-and-plans.js","line":51},"source":"throw new Error('pwn')\n","test":"async thrower"}
           ...
         
         # test count(4) != plan(8)
@@ -69,7 +69,7 @@ not ok 4 - plans of 8 ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 5 - pwn ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"at":{"column":13,"file":"test/test/throws-and-plans.js","line":18},"source":"throw new Error('pwn')\n","test":"async thrower"}
+  {"at":{"column":13,"file":"test-legacy/test/throws-and-plans.js","line":18},"source":"throw new Error('pwn')\n","test":"async thrower"}
   ...
 
 1..5
diff --git a/test-legacy/test/throws.tap b/test-legacy/test/throws.tap
index c33da65..de4c99f 100644
--- a/test-legacy/test/throws.tap
+++ b/test-legacy/test/throws.tap
@@ -4,7 +4,7 @@ TAP version 13
     ok 1 - passing_thrower
     not ok 2 - failing_thrower
       ---
-      {"at":{"column":5,"file":"test/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
+      {"at":{"column":5,"file":"test-legacy/test/throws.js","line":9},"found":"test","pattern":"/fasdfsadf/","source":"t.throws(function failing_thrower () {\n"}
       ...
     
     # failed 1 of 2 tests
diff --git a/test-legacy/test/type-function--bail--buffer.tap b/test-legacy/test/type-function--bail--buffer.tap
index 1dddf23..02c15df 100644
--- a/test-legacy/test/type-function--bail--buffer.tap
+++ b/test-legacy/test/type-function--bail--buffer.tap
@@ -4,7 +4,7 @@ ok 2 - type is Function
 ok 3 - type is Function
 not ok 4 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
   ...
 
 Bail out! # type is Object
diff --git a/test-legacy/test/type-function--bail.tap b/test-legacy/test/type-function--bail.tap
index 1dddf23..02c15df 100644
--- a/test-legacy/test/type-function--bail.tap
+++ b/test-legacy/test/type-function--bail.tap
@@ -4,7 +4,7 @@ ok 2 - type is Function
 ok 3 - type is Function
 not ok 4 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
   ...
 
 Bail out! # type is Object
diff --git a/test-legacy/test/type-function--buffer.tap b/test-legacy/test/type-function--buffer.tap
index 0b4e4f0..e139c6f 100644
--- a/test-legacy/test/type-function--buffer.tap
+++ b/test-legacy/test/type-function--buffer.tap
@@ -4,17 +4,17 @@ ok 2 - type is Function
 ok 3 - type is Function
 not ok 4 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
   ...
 
 not ok 5 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":6},"compare":"===","found":"function","source":"t.type(function () {}, Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":6},"compare":"===","found":"function","source":"t.type(function () {}, Object)\n","wanted":"Object"}
   ...
 
 not ok 6 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":7},"compare":"===","found":"function","source":"t.type(new Function(), Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":7},"compare":"===","found":"function","source":"t.type(new Function(), Object)\n","wanted":"Object"}
   ...
 
 1..6
diff --git a/test-legacy/test/type-function.tap b/test-legacy/test/type-function.tap
index 0b4e4f0..e139c6f 100644
--- a/test-legacy/test/type-function.tap
+++ b/test-legacy/test/type-function.tap
@@ -4,17 +4,17 @@ ok 2 - type is Function
 ok 3 - type is Function
 not ok 4 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":5},"compare":"===","found":"function","source":"t.type(t.type, Object)\n","wanted":"Object"}
   ...
 
 not ok 5 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":6},"compare":"===","found":"function","source":"t.type(function () {}, Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":6},"compare":"===","found":"function","source":"t.type(function () {}, Object)\n","wanted":"Object"}
   ...
 
 not ok 6 - type is Object
   ---
-  {"at":{"column":3,"file":"test/test/type-function.js","line":7},"compare":"===","found":"function","source":"t.type(new Function(), Object)\n","wanted":"Object"}
+  {"at":{"column":3,"file":"test-legacy/test/type-function.js","line":7},"compare":"===","found":"function","source":"t.type(new Function(), Object)\n","wanted":"Object"}
   ...
 
 1..6
diff --git a/test-legacy/test/unfinished--bail--buffer.tap b/test-legacy/test/unfinished--bail--buffer.tap
index f6e82cc..c51fb32 100644
--- a/test-legacy/test/unfinished--bail--buffer.tap
+++ b/test-legacy/test/unfinished--bail--buffer.tap
@@ -4,7 +4,7 @@ not ok 1 - t1 ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
           ...
         
         Bail out! # test unfinished
diff --git a/test-legacy/test/unfinished--bail.tap b/test-legacy/test/unfinished--bail.tap
index 6c7a163..cadb6ac 100644
--- a/test-legacy/test/unfinished--bail.tap
+++ b/test-legacy/test/unfinished--bail.tap
@@ -4,7 +4,7 @@ TAP version 13
         1..1
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
           ...
         
         Bail out! # test unfinished
diff --git a/test-legacy/test/unfinished--buffer.tap b/test-legacy/test/unfinished--buffer.tap
index 9e0af57..5c86de0 100644
--- a/test-legacy/test/unfinished--buffer.tap
+++ b/test-legacy/test/unfinished--buffer.tap
@@ -4,7 +4,7 @@ not ok 1 - t1 ___/# time=[0-9.]+(ms)?/~~~ {
         1..1
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
           ...
         
         # failed 1 test
@@ -19,7 +19,7 @@ ok 2 - 1 === 1
 ok 3 - expect truthy value
 not ok 4 - failsome
   ---
-  {"at":{"column":5,"file":"test/test/unfinished.js","line":23},"hoo":"hah","source":"tap.fail('failsome', { hoo: 'hah' })\n"}
+  {"at":{"column":5,"file":"test-legacy/test/unfinished.js","line":23},"hoo":"hah","source":"tap.fail('failsome', { hoo: 'hah' })\n"}
   ...
 
 not ok 5 - child test left in queue: t.spawn spawny
diff --git a/test-legacy/test/unfinished-empty--bail--buffer.tap b/test-legacy/test/unfinished-empty--bail--buffer.tap
index 8decee3..218b1c1 100644
--- a/test-legacy/test/unfinished-empty--bail--buffer.tap
+++ b/test-legacy/test/unfinished-empty--bail--buffer.tap
@@ -3,7 +3,7 @@ not ok 1 - a ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - b ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
           ...
         
         Bail out! # test unfinished
diff --git a/test-legacy/test/unfinished-empty--bail.tap b/test-legacy/test/unfinished-empty--bail.tap
index 9e26512..515303f 100644
--- a/test-legacy/test/unfinished-empty--bail.tap
+++ b/test-legacy/test/unfinished-empty--bail.tap
@@ -3,7 +3,7 @@ TAP version 13
     # Subtest: b
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
           ...
         
         Bail out! # test unfinished
diff --git a/test-legacy/test/unfinished-empty--buffer.tap b/test-legacy/test/unfinished-empty--buffer.tap
index 67ac548..89a2811 100644
--- a/test-legacy/test/unfinished-empty--buffer.tap
+++ b/test-legacy/test/unfinished-empty--buffer.tap
@@ -3,7 +3,7 @@ not ok 1 - a ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - b ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
           ...
         
         1..1
diff --git a/test-legacy/test/unfinished-empty.tap b/test-legacy/test/unfinished-empty.tap
index daafc39..b33ef4b 100644
--- a/test-legacy/test/unfinished-empty.tap
+++ b/test-legacy/test/unfinished-empty.tap
@@ -3,7 +3,7 @@ TAP version 13
     # Subtest: b
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished-empty.js","line":6},"source":"t.test('b', function (t) {\n","test":"b"}
           ...
         
         1..1
diff --git a/test-legacy/test/unfinished-promise--bail--buffer.tap b/test-legacy/test/unfinished-promise--bail--buffer.tap
index 6804cd0..f5fe10d 100644
--- a/test-legacy/test/unfinished-promise--bail--buffer.tap
+++ b/test-legacy/test/unfinished-promise--bail--buffer.tap
@@ -6,7 +6,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - ok
             not ok 2 - test unfinished
               ---
-              {"at":{"column":14,"file":"test/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
+              {"at":{"column":14,"file":"test-legacy/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
               ...
             
             Bail out! # test unfinished
diff --git a/test-legacy/test/unfinished-promise--bail.tap b/test-legacy/test/unfinished-promise--bail.tap
index 39b5fbb..d95ed67 100644
--- a/test-legacy/test/unfinished-promise--bail.tap
+++ b/test-legacy/test/unfinished-promise--bail.tap
@@ -6,7 +6,7 @@ TAP version 13
             ok 1 - ok
             not ok 2 - test unfinished
               ---
-              {"at":{"column":14,"file":"test/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
+              {"at":{"column":14,"file":"test-legacy/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
               ...
             
             Bail out! # test unfinished
diff --git a/test-legacy/test/unfinished-promise--buffer.tap b/test-legacy/test/unfinished-promise--buffer.tap
index a3a48ef..364582c 100644
--- a/test-legacy/test/unfinished-promise--buffer.tap
+++ b/test-legacy/test/unfinished-promise--buffer.tap
@@ -6,7 +6,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - ok
             not ok 2 - test unfinished
               ---
-              {"at":{"column":14,"file":"test/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
+              {"at":{"column":14,"file":"test-legacy/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
               ...
             
             # test count(2) != plan(3)
diff --git a/test-legacy/test/unfinished-promise.tap b/test-legacy/test/unfinished-promise.tap
index a19e576..9ea3f6f 100644
--- a/test-legacy/test/unfinished-promise.tap
+++ b/test-legacy/test/unfinished-promise.tap
@@ -6,7 +6,7 @@ TAP version 13
             ok 1 - ok
             not ok 2 - test unfinished
               ---
-              {"at":{"column":14,"file":"test/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
+              {"at":{"column":14,"file":"test-legacy/test/unfinished-promise.js","line":4},"source":"return t.test('grandchild', function (t) {\n","test":"grandchild"}
               ...
             
             # test count(2) != plan(3)
diff --git a/test-legacy/test/unfinished.tap b/test-legacy/test/unfinished.tap
index a9b6337..041feb9 100644
--- a/test-legacy/test/unfinished.tap
+++ b/test-legacy/test/unfinished.tap
@@ -4,7 +4,7 @@ TAP version 13
         1..1
         not ok 1 - test unfinished
           ---
-          {"at":{"column":5,"file":"test/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
+          {"at":{"column":5,"file":"test-legacy/test/unfinished.js","line":4},"source":"t.test('t11', function (t) {\n","test":"t11"}
           ...
         
         # failed 1 test
@@ -19,7 +19,7 @@ ok 2 - 1 === 1
 ok 3 - expect truthy value
 not ok 4 - failsome
   ---
-  {"at":{"column":5,"file":"test/test/unfinished.js","line":23},"hoo":"hah","source":"tap.fail('failsome', { hoo: 'hah' })\n"}
+  {"at":{"column":5,"file":"test-legacy/test/unfinished.js","line":23},"hoo":"hah","source":"tap.fail('failsome', { hoo: 'hah' })\n"}
   ...
 
 not ok 5 - child test left in queue: t.spawn spawny
diff --git a/test-legacy/test/unhandled-rejection--bail--buffer.tap b/test-legacy/test/unhandled-rejection--bail--buffer.tap
index fe8bd64..4f1a19b 100644
--- a/test-legacy/test/unhandled-rejection--bail--buffer.tap
+++ b/test-legacy/test/unhandled-rejection--bail--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 # this is fine
 not ok 1 - 💩
   ---
-  {"at":{"column":30,"constructor":true,"file":"test/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
+  {"at":{"column":30,"constructor":true,"file":"test-legacy/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
   ...
 
 Bail out! # 💩
diff --git a/test-legacy/test/unhandled-rejection--bail.tap b/test-legacy/test/unhandled-rejection--bail.tap
index fe8bd64..4f1a19b 100644
--- a/test-legacy/test/unhandled-rejection--bail.tap
+++ b/test-legacy/test/unhandled-rejection--bail.tap
@@ -2,7 +2,7 @@ TAP version 13
 # this is fine
 not ok 1 - 💩
   ---
-  {"at":{"column":30,"constructor":true,"file":"test/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
+  {"at":{"column":30,"constructor":true,"file":"test-legacy/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
   ...
 
 Bail out! # 💩
diff --git a/test-legacy/test/unhandled-rejection--buffer.tap b/test-legacy/test/unhandled-rejection--buffer.tap
index c99bb96..1f42dd4 100644
--- a/test-legacy/test/unhandled-rejection--buffer.tap
+++ b/test-legacy/test/unhandled-rejection--buffer.tap
@@ -2,7 +2,7 @@ TAP version 13
 # this is fine
 not ok 1 - 💩
   ---
-  {"at":{"column":30,"constructor":true,"file":"test/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
+  {"at":{"column":30,"constructor":true,"file":"test-legacy/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
   ...
 
 1..1
diff --git a/test-legacy/test/unhandled-rejection.tap b/test-legacy/test/unhandled-rejection.tap
index c99bb96..1f42dd4 100644
--- a/test-legacy/test/unhandled-rejection.tap
+++ b/test-legacy/test/unhandled-rejection.tap
@@ -2,7 +2,7 @@ TAP version 13
 # this is fine
 not ok 1 - 💩
   ---
-  {"at":{"column":30,"constructor":true,"file":"test/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
+  {"at":{"column":30,"constructor":true,"file":"test-legacy/test/unhandled-rejection.js","line":9},"source":"this.dump = Promise.reject(new Error('💩'))\n","test":"TAP"}
   ...
 
 1..1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-tap.git



More information about the Pkg-javascript-commits mailing list