diff --git a/package.json b/package.json
index 7b218a279f..6e8e4165a3 100644
--- a/package.json
+++ b/package.json
@@ -35,9 +35,9 @@
     "docs:markdown-for-agoric-documentation-repo": "typedoc --plugin typedoc-plugin-markdown --tsconfig tsconfig.build.json",
     "update": "lernaupdate --dedupe",
     "format": "prettier --write .github packages",
-    "lint": "prettier --check .github packages && lerna run lint",
+    "lint": "prettier --check .github packages && lerna run --no-bail lint",
     "lint-fix": "lerna run --no-bail lint-fix",
-    "test": "lerna run --ignore @endo/skel test",
+    "test": "lerna run --ignore @endo/skel --no-bail test",
     "test262": "lerna run test262",
     "build": "lerna run build",
     "build-ts": "tsc --build tsconfig.build.json"
diff --git a/packages/base64/package.json b/packages/base64/package.json
index 086879b26c..edb773066f 100644
--- a/packages/base64/package.json
+++ b/packages/base64/package.json
@@ -74,7 +74,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/base64/test/bench-main.js b/packages/base64/test/_bench-main.js
similarity index 100%
rename from packages/base64/test/bench-main.js
rename to packages/base64/test/_bench-main.js
diff --git a/packages/base64/test/capture-atob-btoa.js b/packages/base64/test/_capture-atob-btoa.js
similarity index 100%
rename from packages/base64/test/capture-atob-btoa.js
rename to packages/base64/test/_capture-atob-btoa.js
diff --git a/packages/base64/test/main.test.js b/packages/base64/test/main.test.js
index 5051fda520..7dad0e13ad 100644
--- a/packages/base64/test/main.test.js
+++ b/packages/base64/test/main.test.js
@@ -1,5 +1,5 @@
 import test from 'ava';
-import { atob as origAtob, btoa as origBtoa } from './capture-atob-btoa.js';
+import { atob as origAtob, btoa as origBtoa } from './_capture-atob-btoa.js';
 import { encodeBase64, decodeBase64, atob, btoa } from '../index.js';
 
 /**
diff --git a/packages/bundle-source/package.json b/packages/bundle-source/package.json
index a381e1bd3c..2117b2aad7 100644
--- a/packages/bundle-source/package.json
+++ b/packages/bundle-source/package.json
@@ -74,7 +74,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ]
   },
diff --git a/packages/bundle-source/test/sanity.js b/packages/bundle-source/test/_sanity.js
similarity index 100%
rename from packages/bundle-source/test/sanity.js
rename to packages/bundle-source/test/_sanity.js
diff --git a/packages/bundle-source/test/endo-script-format.tests.js b/packages/bundle-source/test/endo-script-format.test.js
similarity index 100%
rename from packages/bundle-source/test/endo-script-format.tests.js
rename to packages/bundle-source/test/endo-script-format.test.js
diff --git a/packages/bundle-source/test/sanity-unfiltered.test.js b/packages/bundle-source/test/sanity-unfiltered.test.js
index 61e945457f..892bf438cc 100644
--- a/packages/bundle-source/test/sanity-unfiltered.test.js
+++ b/packages/bundle-source/test/sanity-unfiltered.test.js
@@ -1,4 +1,4 @@
 // Like test-sanity.js but with { stackFiltering: 'verbose' }
-import { makeSanityTests } from './sanity.js';
+import { makeSanityTests } from './_sanity.js';
 
 makeSanityTests('verbose');
diff --git a/packages/bundle-source/test/sanity.test.js b/packages/bundle-source/test/sanity.test.js
index cc328abed2..25482e81b1 100644
--- a/packages/bundle-source/test/sanity.test.js
+++ b/packages/bundle-source/test/sanity.test.js
@@ -1,5 +1,5 @@
 // Like test-sanity-unfiltered.js but with { stackFiltering: 'concise' }
-import { makeSanityTests } from './sanity.js';
+import { makeSanityTests } from './_sanity.js';
 
 // 'concise' is currently the default. But the purpose of this
 // test is not to test what choice is the default. Since the behavior
diff --git a/packages/captp/package.json b/packages/captp/package.json
index e6912b2abc..b9ca6a39d2 100644
--- a/packages/captp/package.json
+++ b/packages/captp/package.json
@@ -72,7 +72,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/check-bundle/package.json b/packages/check-bundle/package.json
index 6c9359bbc5..8f5af31909 100644
--- a/packages/check-bundle/package.json
+++ b/packages/check-bundle/package.json
@@ -80,7 +80,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/cjs-module-analyzer/package.json b/packages/cjs-module-analyzer/package.json
index 9ff01f6844..56e658a166 100644
--- a/packages/cjs-module-analyzer/package.json
+++ b/packages/cjs-module-analyzer/package.json
@@ -64,7 +64,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7fb495bbfe..3e439cdb93 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -82,7 +82,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/cli/test/daemon-context.js b/packages/cli/test/_daemon-context.js
similarity index 100%
rename from packages/cli/test/daemon-context.js
rename to packages/cli/test/_daemon-context.js
diff --git a/packages/cli/test/section.js b/packages/cli/test/_section.js
similarity index 100%
rename from packages/cli/test/section.js
rename to packages/cli/test/_section.js
diff --git a/packages/cli/test/types.d.ts b/packages/cli/test/_types.d.ts
similarity index 100%
rename from packages/cli/test/types.d.ts
rename to packages/cli/test/_types.d.ts
diff --git a/packages/cli/test/with-context.js b/packages/cli/test/_with-context.js
similarity index 100%
rename from packages/cli/test/with-context.js
rename to packages/cli/test/_with-context.js
diff --git a/packages/cli/test/demo/index.test.js b/packages/cli/test/demo/index.test.js
index 817c64664c..7b7f393058 100644
--- a/packages/cli/test/demo/index.test.js
+++ b/packages/cli/test/demo/index.test.js
@@ -1,8 +1,8 @@
 import test from 'ava';
 import { $ } from 'execa';
-import { makeSectionTest } from '../section.js';
-import { withContext } from '../with-context.js';
-import { daemonContext } from '../daemon-context.js';
+import { makeSectionTest } from '../_section.js';
+import { withContext } from '../_with-context.js';
+import { daemonContext } from '../_daemon-context.js';
 import * as counterExample from './counter-example.js';
 import * as doublerAgent from './doubler-agent.js';
 import * as confinedScript from './confined-script.js';
diff --git a/packages/common/package.json b/packages/common/package.json
index 6b7f84e02f..b51072011b 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -74,7 +74,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/compartment-mapper/package.json b/packages/compartment-mapper/package.json
index 1d69ceb93c..64d072fa72 100644
--- a/packages/compartment-mapper/package.json
+++ b/packages/compartment-mapper/package.json
@@ -105,7 +105,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/daemon/package.json b/packages/daemon/package.json
index 06ed74b45d..42d4ae83a2 100644
--- a/packages/daemon/package.json
+++ b/packages/daemon/package.json
@@ -99,7 +99,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/env-options/package.json b/packages/env-options/package.json
index f4cdf92ea1..6716b9dec2 100644
--- a/packages/env-options/package.json
+++ b/packages/env-options/package.json
@@ -80,7 +80,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/errors/package.json b/packages/errors/package.json
index 45b00c2d41..2d9c98b36b 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -68,7 +68,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/evasive-transform/package.json b/packages/evasive-transform/package.json
index a16419965a..80e7835ecd 100644
--- a/packages/evasive-transform/package.json
+++ b/packages/evasive-transform/package.json
@@ -73,7 +73,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/evasive-transform/test/prepare-test-env-ava-fixture.js b/packages/evasive-transform/test/_prepare-test-env-ava-fixture.js
similarity index 100%
rename from packages/evasive-transform/test/prepare-test-env-ava-fixture.js
rename to packages/evasive-transform/test/_prepare-test-env-ava-fixture.js
diff --git a/packages/evasive-transform/test/rebuild-fixtures.js b/packages/evasive-transform/test/_rebuild-fixtures.js
similarity index 100%
rename from packages/evasive-transform/test/rebuild-fixtures.js
rename to packages/evasive-transform/test/_rebuild-fixtures.js
diff --git a/packages/evasive-transform/test/elide-comment.test.js b/packages/evasive-transform/test/elide-comment.test.js
index ef58d44523..97d140455d 100644
--- a/packages/evasive-transform/test/elide-comment.test.js
+++ b/packages/evasive-transform/test/elide-comment.test.js
@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava-fixture.js';
+import { test } from './_prepare-test-env-ava-fixture.js';
 import { elideComment } from '../src/transform-comment.js';
 import { evadeCensorSync } from '../src/index.js';
 
diff --git a/packages/evasive-transform/test/evade-censor.test.js b/packages/evasive-transform/test/evade-censor.test.js
index a7ab90fa57..bb2a7a19ba 100644
--- a/packages/evasive-transform/test/evade-censor.test.js
+++ b/packages/evasive-transform/test/evade-censor.test.js
@@ -1,5 +1,5 @@
 import { evadeCensorSync } from '../src/index.js';
-import { test } from './prepare-test-env-ava-fixture.js';
+import { test } from './_prepare-test-env-ava-fixture.js';
 
 /**
  * Removes all linefeeds from string
diff --git a/packages/evasive-transform/test/location-unmapper.test.js b/packages/evasive-transform/test/location-unmapper.test.js
index da97444c8e..cabc0a7ed5 100644
--- a/packages/evasive-transform/test/location-unmapper.test.js
+++ b/packages/evasive-transform/test/location-unmapper.test.js
@@ -1,6 +1,6 @@
 import babelParser from '@babel/parser';
 import { makeLocationUnmapper } from '../src/location-unmapper.js';
-import { test } from './prepare-test-env-ava-fixture.js';
+import { test } from './_prepare-test-env-ava-fixture.js';
 
 const { parse: parseBabel } = babelParser;
 
diff --git a/packages/evasive-transform/test/transform-comment.test.js b/packages/evasive-transform/test/transform-comment.test.js
index 5588546868..b9f04c1387 100644
--- a/packages/evasive-transform/test/transform-comment.test.js
+++ b/packages/evasive-transform/test/transform-comment.test.js
@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava-fixture.js';
+import { test } from './_prepare-test-env-ava-fixture.js';
 import { evadeComment } from '../src/transform-comment.js';
 
 test('evadeComment() - Node type becomes CommentBlock', async t => {
diff --git a/packages/eventual-send/package.json b/packages/eventual-send/package.json
index 0dfbb0b763..b032f5e55e 100644
--- a/packages/eventual-send/package.json
+++ b/packages/eventual-send/package.json
@@ -70,7 +70,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/eventual-send/src/exports.test-d.ts b/packages/eventual-send/src/exports.test-d.ts
index 1d71ed03b3..ce3b641941 100644
--- a/packages/eventual-send/src/exports.test-d.ts
+++ b/packages/eventual-send/src/exports.test-d.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @endo/no-polymorphic-call, import/no-extraneous-dependencies, no-restricted-globals */
 import { expectType } from 'tsd';
-import { E } from '../test/get-hp.js';
+import { E } from '../test/_get-hp.js';
 import type { ERef, FarRef } from './exports.js';
 
 // Check the legacy ERef type
diff --git a/packages/eventual-send/test/get-hp.js b/packages/eventual-send/test/_get-hp.js
similarity index 100%
rename from packages/eventual-send/test/get-hp.js
rename to packages/eventual-send/test/_get-hp.js
diff --git a/packages/eventual-send/test/deep-send.test.js b/packages/eventual-send/test/deep-send.test.js
index 299d951493..4fd92f5272 100644
--- a/packages/eventual-send/test/deep-send.test.js
+++ b/packages/eventual-send/test/deep-send.test.js
@@ -5,7 +5,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { E } from './get-hp.js';
+import { E } from './_get-hp.js';
 
 const { freeze } = Object;
 
diff --git a/packages/eventual-send/test/deep-stacks.test.js b/packages/eventual-send/test/deep-stacks.test.js
index 208eff7c23..0460cbd475 100644
--- a/packages/eventual-send/test/deep-stacks.test.js
+++ b/packages/eventual-send/test/deep-stacks.test.js
@@ -5,7 +5,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { E } from './get-hp.js';
+import { E } from './_get-hp.js';
 
 const testDeepStacksWhen = test.macro({
   title: (title, loggerDescription, _getLogger) =>
diff --git a/packages/eventual-send/test/e.test.js b/packages/eventual-send/test/e.test.js
index c972f9faae..6a0da3e31f 100644
--- a/packages/eventual-send/test/e.test.js
+++ b/packages/eventual-send/test/e.test.js
@@ -1,7 +1,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { E, HandledPromise } from './get-hp.js';
+import { E, HandledPromise } from './_get-hp.js';
 
 test('E reexports', async t => {
   t.is(E.resolve, HandledPromise.resolve, 'E reexports resolve');
diff --git a/packages/eventual-send/test/eventual-send.test.js b/packages/eventual-send/test/eventual-send.test.js
index 1771255d31..757348c25b 100644
--- a/packages/eventual-send/test/eventual-send.test.js
+++ b/packages/eventual-send/test/eventual-send.test.js
@@ -2,7 +2,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { HandledPromise } from './get-hp.js';
+import { HandledPromise } from './_get-hp.js';
 
 const { getPrototypeOf } = Object;
 const { details: X } = assert;
diff --git a/packages/eventual-send/test/hp.test.js b/packages/eventual-send/test/hp.test.js
index 6ff0a9e9a1..c3fd760b05 100644
--- a/packages/eventual-send/test/hp.test.js
+++ b/packages/eventual-send/test/hp.test.js
@@ -1,7 +1,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { HandledPromise } from './get-hp.js';
+import { HandledPromise } from './_get-hp.js';
 
 const { getPrototypeOf, isFrozen } = Object;
 const { ownKeys, getOwnPropertyDescriptor } = Reflect;
diff --git a/packages/eventual-send/test/proxy.test.js b/packages/eventual-send/test/proxy.test.js
index 3a7f459b91..331d54b93a 100644
--- a/packages/eventual-send/test/proxy.test.js
+++ b/packages/eventual-send/test/proxy.test.js
@@ -1,7 +1,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { HandledPromise } from './get-hp.js';
+import { HandledPromise } from './_get-hp.js';
 
 test('resolveWithPresence with proxy options', async t => {
   const l = t.log; // decomment this line for debug aid
diff --git a/packages/eventual-send/test/thenable.test.js b/packages/eventual-send/test/thenable.test.js
index 2f194ada3f..9db1f8bc6b 100644
--- a/packages/eventual-send/test/thenable.test.js
+++ b/packages/eventual-send/test/thenable.test.js
@@ -1,7 +1,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { E, HandledPromise } from './get-hp.js';
+import { E, HandledPromise } from './_get-hp.js';
 
 const verifySimplePromise = async (t, resolve) => {
   const p = new Promise(_ => {});
diff --git a/packages/eventual-send/test/types.test.js b/packages/eventual-send/test/types.test.js
index 6b83bb9c20..5ac8bf9b2b 100644
--- a/packages/eventual-send/test/types.test.js
+++ b/packages/eventual-send/test/types.test.js
@@ -1,7 +1,7 @@
 import '@endo/lockdown/commit-debug.js';
 import test from 'ava';
 
-import { E } from './get-hp.js';
+import { E } from './_get-hp.js';
 
 /**
  * Mock a Remotable maker.
diff --git a/packages/exo/package.json b/packages/exo/package.json
index 03a345bb01..52c3520c25 100644
--- a/packages/exo/package.json
+++ b/packages/exo/package.json
@@ -75,7 +75,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/exo/test/make-legacy-guards.js b/packages/exo/test/_make-legacy-guards.js
similarity index 100%
rename from packages/exo/test/make-legacy-guards.js
rename to packages/exo/test/_make-legacy-guards.js
diff --git a/packages/exo/test/prepare-test-env-ava-label-instances.js b/packages/exo/test/_prepare-test-env-ava-label-instances.js
similarity index 100%
rename from packages/exo/test/prepare-test-env-ava-label-instances.js
rename to packages/exo/test/_prepare-test-env-ava-label-instances.js
diff --git a/packages/exo/test/label-instances.test.js b/packages/exo/test/label-instances.test.js
index 7395fdd4f5..2063cfc7b8 100644
--- a/packages/exo/test/label-instances.test.js
+++ b/packages/exo/test/label-instances.test.js
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/order
-import test from './prepare-test-env-ava-label-instances.js';
+import test from './_prepare-test-env-ava-label-instances.js';
 
 // eslint-disable-next-line import/order
 import { passStyleOf } from '@endo/far';
diff --git a/packages/exo/test/legacy-guard-tolerance.test.js b/packages/exo/test/legacy-guard-tolerance.test.js
index d77d3e1542..470bd7ba40 100644
--- a/packages/exo/test/legacy-guard-tolerance.test.js
+++ b/packages/exo/test/legacy-guard-tolerance.test.js
@@ -12,7 +12,7 @@ import {
   makeLegacyAwaitArgGuard,
   makeLegacyMethodGuard,
   makeLegacyInterfaceGuard,
-} from './make-legacy-guards.js';
+} from './_make-legacy-guards.js';
 import { makeExo } from '../src/exo-makers.js';
 
 test('legacy guard tolerance', async t => {
diff --git a/packages/far/package.json b/packages/far/package.json
index e3f26c9bee..f4c799d0b4 100644
--- a/packages/far/package.json
+++ b/packages/far/package.json
@@ -72,7 +72,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/immutable-arraybuffer/package.json b/packages/immutable-arraybuffer/package.json
index 7432914c09..a699a42282 100644
--- a/packages/immutable-arraybuffer/package.json
+++ b/packages/immutable-arraybuffer/package.json
@@ -63,7 +63,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/import-bundle/package.json b/packages/import-bundle/package.json
index a45e16b51f..cbe8b53f81 100644
--- a/packages/import-bundle/package.json
+++ b/packages/import-bundle/package.json
@@ -74,7 +74,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/init/package.json b/packages/init/package.json
index 61d0e9941b..839b7f1e2e 100644
--- a/packages/init/package.json
+++ b/packages/init/package.json
@@ -63,7 +63,6 @@
   "homepage": "https://github.com/endojs/endo#readme",
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ]
   },
diff --git a/packages/lockdown/package.json b/packages/lockdown/package.json
index ea6eaebb22..042d87ac7d 100644
--- a/packages/lockdown/package.json
+++ b/packages/lockdown/package.json
@@ -48,7 +48,6 @@
   "homepage": "https://github.com/endojs/endo#readme",
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ]
   },
diff --git a/packages/lp32/package.json b/packages/lp32/package.json
index 69ef39182d..f79e276a59 100644
--- a/packages/lp32/package.json
+++ b/packages/lp32/package.json
@@ -89,7 +89,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/marshal/package.json b/packages/marshal/package.json
index 4fb825ecbd..1d0f7fa2b0 100644
--- a/packages/marshal/package.json
+++ b/packages/marshal/package.json
@@ -78,7 +78,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/marshal/test/marshal-test-data.js b/packages/marshal/test/_marshal-test-data.js
similarity index 100%
rename from packages/marshal/test/marshal-test-data.js
rename to packages/marshal/test/_marshal-test-data.js
diff --git a/packages/marshal/test/encodePassable.test.js b/packages/marshal/test/encodePassable.test.js
index 6583479efe..f0fbd63053 100644
--- a/packages/marshal/test/encodePassable.test.js
+++ b/packages/marshal/test/encodePassable.test.js
@@ -13,7 +13,7 @@ import {
   makeDecodePassable,
 } from '../src/encodePassable.js';
 import { compareRank, makeComparatorKit } from '../src/rankOrder.js';
-import { unsortedSample } from './marshal-test-data.js';
+import { unsortedSample } from './_marshal-test-data.js';
 
 const buffers = {
   __proto__: null,
diff --git a/packages/marshal/test/marshal-capdata.test.js b/packages/marshal/test/marshal-capdata.test.js
index 3e14762753..90e7d10819 100644
--- a/packages/marshal/test/marshal-capdata.test.js
+++ b/packages/marshal/test/marshal-capdata.test.js
@@ -2,7 +2,7 @@ import test from '@endo/ses-ava/prepare-endo.js';
 
 import { passStyleOf, Far } from '@endo/pass-style';
 import { makeMarshal } from '../src/marshal.js';
-import { roundTripPairs } from './marshal-test-data.js';
+import { roundTripPairs } from './_marshal-test-data.js';
 
 const {
   freeze,
diff --git a/packages/marshal/test/marshal-justin.test.js b/packages/marshal/test/marshal-justin.test.js
index d72c57e95c..5498f53297 100644
--- a/packages/marshal/test/marshal-justin.test.js
+++ b/packages/marshal/test/marshal-justin.test.js
@@ -3,7 +3,7 @@ import test from '@endo/ses-ava/prepare-endo.js';
 import { Remotable, makeTagged } from '@endo/pass-style';
 import { makeMarshal } from '../src/marshal.js';
 import { decodeToJustin } from '../src/marshal-justin.js';
-import { jsonJustinPairs } from './marshal-test-data.js';
+import { jsonJustinPairs } from './_marshal-test-data.js';
 
 // this only includes the tests that do not use liveSlots
 
diff --git a/packages/marshal/test/marshal-smallcaps.test.js b/packages/marshal/test/marshal-smallcaps.test.js
index ce5f1a763a..87ed067ba3 100644
--- a/packages/marshal/test/marshal-smallcaps.test.js
+++ b/packages/marshal/test/marshal-smallcaps.test.js
@@ -3,7 +3,7 @@ import test from '@endo/ses-ava/prepare-endo.js';
 import { Far, makeTagged, passStyleOf } from '@endo/pass-style';
 import { makeMarshal } from '../src/marshal.js';
 
-import { roundTripPairs } from './marshal-test-data.js';
+import { roundTripPairs } from './_marshal-test-data.js';
 
 const {
   freeze,
diff --git a/packages/marshal/test/marshal-stringify.test.js b/packages/marshal/test/marshal-stringify.test.js
index e72dd2a1a9..2fad22ce65 100644
--- a/packages/marshal/test/marshal-stringify.test.js
+++ b/packages/marshal/test/marshal-stringify.test.js
@@ -2,7 +2,7 @@ import test from '@endo/ses-ava/prepare-endo.js';
 
 import { Far } from '@endo/pass-style';
 import { stringify, parse } from '../src/marshal-stringify.js';
-import { roundTripPairs } from './marshal-test-data.js';
+import { roundTripPairs } from './_marshal-test-data.js';
 
 const { isFrozen } = Object;
 
diff --git a/packages/marshal/test/rankOrder.test.js b/packages/marshal/test/rankOrder.test.js
index 83a1e0d28a..cbf51bec0e 100644
--- a/packages/marshal/test/rankOrder.test.js
+++ b/packages/marshal/test/rankOrder.test.js
@@ -16,7 +16,7 @@ import {
   getIndexCover,
   assertRankSorted,
 } from '../src/rankOrder.js';
-import { unsortedSample, sortedSample } from './marshal-test-data.js';
+import { unsortedSample, sortedSample } from './_marshal-test-data.js';
 
 test('compareRank is reflexive', async t => {
   await fc.assert(
diff --git a/packages/memoize/package.json b/packages/memoize/package.json
index dac526a979..a040cfc0db 100644
--- a/packages/memoize/package.json
+++ b/packages/memoize/package.json
@@ -70,7 +70,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/module-source/package.json b/packages/module-source/package.json
index a40e2ecb77..22b1748454 100644
--- a/packages/module-source/package.json
+++ b/packages/module-source/package.json
@@ -77,7 +77,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/module-source/test/benchmark-babel-plugin.js b/packages/module-source/test/_benchmark-babel-plugin.js
similarity index 100%
rename from packages/module-source/test/benchmark-babel-plugin.js
rename to packages/module-source/test/_benchmark-babel-plugin.js
diff --git a/packages/module-source/test/lockdown.js b/packages/module-source/test/_lockdown.js
similarity index 100%
rename from packages/module-source/test/lockdown.js
rename to packages/module-source/test/_lockdown.js
diff --git a/packages/module-source/test/module-source.test.js b/packages/module-source/test/module-source.test.js
index 21d40fb10b..1ddf5dfb1f 100644
--- a/packages/module-source/test/module-source.test.js
+++ b/packages/module-source/test/module-source.test.js
@@ -4,7 +4,7 @@
 
 // eslint-disable-next-line import/order
 import { ModuleSource } from '../src/module-source.js';
-import './lockdown.js';
+import './_lockdown.js';
 import url from 'url';
 import fs from 'fs';
 import test from 'ava';
diff --git a/packages/nat/package.json b/packages/nat/package.json
index 8511ca1e96..075e3c1d5a 100644
--- a/packages/nat/package.json
+++ b/packages/nat/package.json
@@ -61,7 +61,6 @@
   ],
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ]
   },
diff --git a/packages/netstring/package.json b/packages/netstring/package.json
index 8a6140a9d5..2dd3ff5f7d 100644
--- a/packages/netstring/package.json
+++ b/packages/netstring/package.json
@@ -73,7 +73,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/pass-style/package.json b/packages/pass-style/package.json
index 1da9aceae4..01e5d7d8c3 100644
--- a/packages/pass-style/package.json
+++ b/packages/pass-style/package.json
@@ -74,7 +74,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/pass-style/test/prepare-breakpoints.js b/packages/pass-style/test/_prepare-breakpoints.js
similarity index 100%
rename from packages/pass-style/test/prepare-breakpoints.js
rename to packages/pass-style/test/_prepare-breakpoints.js
diff --git a/packages/pass-style/test/prepare-only-well-formed-strings-passable.js b/packages/pass-style/test/_prepare-only-well-formed-strings-passable.js
similarity index 100%
rename from packages/pass-style/test/prepare-only-well-formed-strings-passable.js
rename to packages/pass-style/test/_prepare-only-well-formed-strings-passable.js
diff --git a/packages/pass-style/test/message-breakpoints-demo.test.js b/packages/pass-style/test/message-breakpoints-demo.test.js
index f4c0e9118c..98825079ef 100644
--- a/packages/pass-style/test/message-breakpoints-demo.test.js
+++ b/packages/pass-style/test/message-breakpoints-demo.test.js
@@ -1,4 +1,4 @@
-import './prepare-breakpoints.js';
+import './_prepare-breakpoints.js';
 import test from '@endo/ses-ava/prepare-endo.js';
 
 import { E } from '@endo/eventual-send';
diff --git a/packages/pass-style/test/message-breakpoints.test.js b/packages/pass-style/test/message-breakpoints.test.js
index 02dcc2e6b4..2b4b9de893 100644
--- a/packages/pass-style/test/message-breakpoints.test.js
+++ b/packages/pass-style/test/message-breakpoints.test.js
@@ -1,4 +1,4 @@
-import './prepare-breakpoints.js';
+import './_prepare-breakpoints.js';
 import test from '@endo/ses-ava/prepare-endo.js';
 
 import { makeMessageBreakpointTester } from '@endo/eventual-send/utils.js';
diff --git a/packages/pass-style/test/passable-string.test.js b/packages/pass-style/test/passable-string.test.js
index 1a3f5f95d1..56ef9c93b3 100644
--- a/packages/pass-style/test/passable-string.test.js
+++ b/packages/pass-style/test/passable-string.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-useless-concat */
-import './prepare-only-well-formed-strings-passable.js';
+import './_prepare-only-well-formed-strings-passable.js';
 import test from '@endo/ses-ava/prepare-endo.js';
 
 import { isWellFormedString, assertWellFormedString } from '../src/string.js';
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index a44b5798c3..d9a8dbbe48 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -72,7 +72,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/promise-kit/package.json b/packages/promise-kit/package.json
index f6fc8efc74..2e8289de92 100644
--- a/packages/promise-kit/package.json
+++ b/packages/promise-kit/package.json
@@ -73,7 +73,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/promise-kit/test/lockdown.js b/packages/promise-kit/test/_lockdown.js
similarity index 100%
rename from packages/promise-kit/test/lockdown.js
rename to packages/promise-kit/test/_lockdown.js
diff --git a/packages/promise-kit/test/promise-kit.test.js b/packages/promise-kit/test/promise-kit.test.js
index b7bbaacf09..1ac941c6fd 100644
--- a/packages/promise-kit/test/promise-kit.test.js
+++ b/packages/promise-kit/test/promise-kit.test.js
@@ -1,7 +1,7 @@
 /* globals globalThis, FinalizationRegistry, setImmediate */
 
 import 'ses';
-import './lockdown.js';
+import './_lockdown.js';
 import test from 'ava';
 
 import v8 from 'node:v8';
diff --git a/packages/ses-ava/package.json b/packages/ses-ava/package.json
index 69124a30eb..7a6f7319cb 100644
--- a/packages/ses-ava/package.json
+++ b/packages/ses-ava/package.json
@@ -77,7 +77,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/ses-ava/test/example-problem.js b/packages/ses-ava/test/_example-problem.js
similarity index 100%
rename from packages/ses-ava/test/example-problem.js
rename to packages/ses-ava/test/_example-problem.js
diff --git a/packages/ses-ava/test/raw-ava-reject.test.js b/packages/ses-ava/test/raw-ava-reject.test.js
index 604b9c75d4..5d18d50502 100644
--- a/packages/ses-ava/test/raw-ava-reject.test.js
+++ b/packages/ses-ava/test/raw-ava-reject.test.js
@@ -4,7 +4,7 @@
 
 import 'ses';
 import test from 'ava';
-import { exampleProblem } from './example-problem.js';
+import { exampleProblem } from './_example-problem.js';
 
 lockdown({
   // Comment or uncomment each of these switches to see variations of the
diff --git a/packages/ses-ava/test/raw-ava-throw.test.js b/packages/ses-ava/test/raw-ava-throw.test.js
index 1449a96294..3cf6e61191 100644
--- a/packages/ses-ava/test/raw-ava-throw.test.js
+++ b/packages/ses-ava/test/raw-ava-throw.test.js
@@ -4,7 +4,7 @@
 
 import 'ses';
 import test from 'ava';
-import { exampleProblem } from './example-problem.js';
+import { exampleProblem } from './_example-problem.js';
 
 lockdown({
   // Comment or uncomment each of these switches to see variations of the
diff --git a/packages/ses-ava/test/ses-ava-reject.test.js b/packages/ses-ava/test/ses-ava-reject.test.js
index c7dee9b126..1eb5b3f89e 100644
--- a/packages/ses-ava/test/ses-ava-reject.test.js
+++ b/packages/ses-ava/test/ses-ava-reject.test.js
@@ -5,7 +5,7 @@
 import 'ses';
 import rawTest from 'ava';
 import { wrapTest } from '../src/ses-ava-test.js';
-import { exampleProblem } from './example-problem.js';
+import { exampleProblem } from './_example-problem.js';
 
 lockdown({
   // Comment or uncomment each of these switches to see variations of the
diff --git a/packages/ses-ava/test/ses-ava-throw.test.js b/packages/ses-ava/test/ses-ava-throw.test.js
index 0aa7a8c709..9360e49fec 100644
--- a/packages/ses-ava/test/ses-ava-throw.test.js
+++ b/packages/ses-ava/test/ses-ava-throw.test.js
@@ -5,7 +5,7 @@
 import 'ses';
 import rawTest from 'ava';
 import { wrapTest } from '../src/ses-ava-test.js';
-import { exampleProblem } from './example-problem.js';
+import { exampleProblem } from './_example-problem.js';
 
 lockdown({
   // Comment or uncomment each of these switches to see variations of the
diff --git a/packages/ses/package.json b/packages/ses/package.json
index 05bc599fa4..45ab466393 100644
--- a/packages/ses/package.json
+++ b/packages/ses/package.json
@@ -196,7 +196,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/ses/scripts/bundle.js b/packages/ses/scripts/bundle.js
index aec5c4da96..9b330299f1 100644
--- a/packages/ses/scripts/bundle.js
+++ b/packages/ses/scripts/bundle.js
@@ -1,11 +1,12 @@
 /* global process */
 import '../index.js';
-import '../test/lockdown-safe.js';
 import fs from 'fs';
 import { makeBundle } from '@endo/compartment-mapper/bundle.js';
 import { minify } from 'terser';
 import { fileURLToPath, pathToFileURL } from 'url';
 
+lockdown();
+
 const resolve = (rel, abs) => fileURLToPath(new URL(rel, abs).toString());
 const root = new URL('..', import.meta.url).toString();
 
diff --git a/packages/ses/test/ava-after-install-safe.js b/packages/ses/test/_ava-after-install-safe.js
similarity index 96%
rename from packages/ses/test/ava-after-install-safe.js
rename to packages/ses/test/_ava-after-install-safe.js
index 115b5c1dd4..23c01b95c5 100644
--- a/packages/ses/test/ava-after-install-safe.js
+++ b/packages/ses/test/_ava-after-install-safe.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 // Confirm that tap can be imported after a safe-Error lockdown, and exercise
diff --git a/packages/ses/test/ava-after-install-unsafe.js b/packages/ses/test/_ava-after-install-unsafe.js
similarity index 96%
rename from packages/ses/test/ava-after-install-unsafe.js
rename to packages/ses/test/_ava-after-install-unsafe.js
index 1d75f8c814..2ce64ce6d9 100644
--- a/packages/ses/test/ava-after-install-unsafe.js
+++ b/packages/ses/test/_ava-after-install-unsafe.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-unsafe.js';
+import './_lockdown-unsafe.js';
 import test from 'ava';
 
 // Confirm that tap can be imported after an unsafe-Error lockdown, and
diff --git a/packages/ses/test/check-intrinsics.js b/packages/ses/test/_check-intrinsics.js
similarity index 100%
rename from packages/ses/test/check-intrinsics.js
rename to packages/ses/test/_check-intrinsics.js
diff --git a/packages/ses/test/console-error-trap/abort-lockdown.js b/packages/ses/test/_console-error-trap/abort-lockdown.js
similarity index 100%
rename from packages/ses/test/console-error-trap/abort-lockdown.js
rename to packages/ses/test/_console-error-trap/abort-lockdown.js
diff --git a/packages/ses/test/console-error-trap/abort.js b/packages/ses/test/_console-error-trap/abort.js
similarity index 100%
rename from packages/ses/test/console-error-trap/abort.js
rename to packages/ses/test/_console-error-trap/abort.js
diff --git a/packages/ses/test/console-error-trap/default-lockdown.js b/packages/ses/test/_console-error-trap/default-lockdown.js
similarity index 100%
rename from packages/ses/test/console-error-trap/default-lockdown.js
rename to packages/ses/test/_console-error-trap/default-lockdown.js
diff --git a/packages/ses/test/console-error-trap/default.js b/packages/ses/test/_console-error-trap/default.js
similarity index 100%
rename from packages/ses/test/console-error-trap/default.js
rename to packages/ses/test/_console-error-trap/default.js
diff --git a/packages/ses/test/console-error-trap/exit-code-lockdown.js b/packages/ses/test/_console-error-trap/exit-code-lockdown.js
similarity index 100%
rename from packages/ses/test/console-error-trap/exit-code-lockdown.js
rename to packages/ses/test/_console-error-trap/exit-code-lockdown.js
diff --git a/packages/ses/test/console-error-trap/exit-code.js b/packages/ses/test/_console-error-trap/exit-code.js
similarity index 100%
rename from packages/ses/test/console-error-trap/exit-code.js
rename to packages/ses/test/_console-error-trap/exit-code.js
diff --git a/packages/ses/test/console-error-trap/exit-lockdown.js b/packages/ses/test/_console-error-trap/exit-lockdown.js
similarity index 100%
rename from packages/ses/test/console-error-trap/exit-lockdown.js
rename to packages/ses/test/_console-error-trap/exit-lockdown.js
diff --git a/packages/ses/test/console-error-trap/exit.js b/packages/ses/test/_console-error-trap/exit.js
similarity index 100%
rename from packages/ses/test/console-error-trap/exit.js
rename to packages/ses/test/_console-error-trap/exit.js
diff --git a/packages/ses/test/console-error-trap/hazard.js b/packages/ses/test/_console-error-trap/hazard.js
similarity index 100%
rename from packages/ses/test/console-error-trap/hazard.js
rename to packages/ses/test/_console-error-trap/hazard.js
diff --git a/packages/ses/test/console-error-trap/index.html b/packages/ses/test/_console-error-trap/index.html
similarity index 100%
rename from packages/ses/test/console-error-trap/index.html
rename to packages/ses/test/_console-error-trap/index.html
diff --git a/packages/ses/test/console-error-trap/platform-lockdown.js b/packages/ses/test/_console-error-trap/platform-lockdown.js
similarity index 100%
rename from packages/ses/test/console-error-trap/platform-lockdown.js
rename to packages/ses/test/_console-error-trap/platform-lockdown.js
diff --git a/packages/ses/test/console-error-trap/platform.js b/packages/ses/test/_console-error-trap/platform.js
similarity index 100%
rename from packages/ses/test/console-error-trap/platform.js
rename to packages/ses/test/_console-error-trap/platform.js
diff --git a/packages/ses/test/console-error-trap/report-lockdown.js b/packages/ses/test/_console-error-trap/report-lockdown.js
similarity index 100%
rename from packages/ses/test/console-error-trap/report-lockdown.js
rename to packages/ses/test/_console-error-trap/report-lockdown.js
diff --git a/packages/ses/test/console-error-trap/report.js b/packages/ses/test/_console-error-trap/report.js
similarity index 100%
rename from packages/ses/test/console-error-trap/report.js
rename to packages/ses/test/_console-error-trap/report.js
diff --git a/packages/ses/test/console-rejection-trap/default-lockdown.js b/packages/ses/test/_console-rejection-trap/default-lockdown.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/default-lockdown.js
rename to packages/ses/test/_console-rejection-trap/default-lockdown.js
diff --git a/packages/ses/test/console-rejection-trap/default.js b/packages/ses/test/_console-rejection-trap/default.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/default.js
rename to packages/ses/test/_console-rejection-trap/default.js
diff --git a/packages/ses/test/console-rejection-trap/hazard.js b/packages/ses/test/_console-rejection-trap/hazard.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/hazard.js
rename to packages/ses/test/_console-rejection-trap/hazard.js
diff --git a/packages/ses/test/console-rejection-trap/index.html b/packages/ses/test/_console-rejection-trap/index.html
similarity index 100%
rename from packages/ses/test/console-rejection-trap/index.html
rename to packages/ses/test/_console-rejection-trap/index.html
diff --git a/packages/ses/test/console-rejection-trap/none-lockdown.js b/packages/ses/test/_console-rejection-trap/none-lockdown.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/none-lockdown.js
rename to packages/ses/test/_console-rejection-trap/none-lockdown.js
diff --git a/packages/ses/test/console-rejection-trap/none.js b/packages/ses/test/_console-rejection-trap/none.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/none.js
rename to packages/ses/test/_console-rejection-trap/none.js
diff --git a/packages/ses/test/console-rejection-trap/report-lockdown.js b/packages/ses/test/_console-rejection-trap/report-lockdown.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/report-lockdown.js
rename to packages/ses/test/_console-rejection-trap/report-lockdown.js
diff --git a/packages/ses/test/console-rejection-trap/report.js b/packages/ses/test/_console-rejection-trap/report.js
similarity index 100%
rename from packages/ses/test/console-rejection-trap/report.js
rename to packages/ses/test/_console-rejection-trap/report.js
diff --git a/packages/ses/test/core-js-configuration.js b/packages/ses/test/_core-js-configuration.js
similarity index 100%
rename from packages/ses/test/core-js-configuration.js
rename to packages/ses/test/_core-js-configuration.js
diff --git a/packages/ses/test/enforce-cjs-strict.js b/packages/ses/test/_enforce-cjs-strict.js
similarity index 100%
rename from packages/ses/test/enforce-cjs-strict.js
rename to packages/ses/test/_enforce-cjs-strict.js
diff --git a/packages/ses/test/harden-mockery.js b/packages/ses/test/_harden-mockery.js
similarity index 100%
rename from packages/ses/test/harden-mockery.js
rename to packages/ses/test/_harden-mockery.js
diff --git a/packages/ses/test/import-commons.js b/packages/ses/test/_import-commons.js
similarity index 100%
rename from packages/ses/test/import-commons.js
rename to packages/ses/test/_import-commons.js
diff --git a/packages/ses/test/lockdown-harden-unsafe.js b/packages/ses/test/_lockdown-harden-unsafe.js
similarity index 100%
rename from packages/ses/test/lockdown-harden-unsafe.js
rename to packages/ses/test/_lockdown-harden-unsafe.js
diff --git a/packages/ses/test/lockdown-safe.js b/packages/ses/test/_lockdown-safe.js
similarity index 100%
rename from packages/ses/test/lockdown-safe.js
rename to packages/ses/test/_lockdown-safe.js
diff --git a/packages/ses/test/lockdown-unsafe.js b/packages/ses/test/_lockdown-unsafe.js
similarity index 100%
rename from packages/ses/test/lockdown-unsafe.js
rename to packages/ses/test/_lockdown-unsafe.js
diff --git a/packages/ses/test/no-direct-eval.js b/packages/ses/test/_no-direct-eval.js
similarity index 100%
rename from packages/ses/test/no-direct-eval.js
rename to packages/ses/test/_no-direct-eval.js
diff --git a/packages/ses/test/no-eval.js b/packages/ses/test/_no-eval.js
similarity index 100%
rename from packages/ses/test/no-eval.js
rename to packages/ses/test/_no-eval.js
diff --git a/packages/ses/test/node.js b/packages/ses/test/_node.js
similarity index 96%
rename from packages/ses/test/node.js
rename to packages/ses/test/_node.js
index c4fa465dd8..3f02abae8f 100644
--- a/packages/ses/test/node.js
+++ b/packages/ses/test/_node.js
@@ -1,7 +1,7 @@
 // Module node.js provides resolve and locate hooks that follow a subset of
 // Node.js module semantics.
 
-import { makeStaticRetriever, makeImporter } from './import-commons.js';
+import { makeStaticRetriever, makeImporter } from './_import-commons.js';
 
 const q = JSON.stringify;
 
diff --git a/packages/ses/test/override-tester.js b/packages/ses/test/_override-tester.js
similarity index 100%
rename from packages/ses/test/override-tester.js
rename to packages/ses/test/_override-tester.js
diff --git a/packages/ses/test/package/package.json b/packages/ses/test/_package/package.json
similarity index 100%
rename from packages/ses/test/package/package.json
rename to packages/ses/test/_package/package.json
diff --git a/packages/ses/test/package/test.cjs b/packages/ses/test/_package/test.cjs
similarity index 100%
rename from packages/ses/test/package/test.cjs
rename to packages/ses/test/_package/test.cjs
diff --git a/packages/ses/test/package/test.js b/packages/ses/test/_package/test.js
similarity index 100%
rename from packages/ses/test/package/test.js
rename to packages/ses/test/_package/test.js
diff --git a/packages/ses/test/package/test.mjs b/packages/ses/test/_package/test.mjs
similarity index 100%
rename from packages/ses/test/package/test.mjs
rename to packages/ses/test/_package/test.mjs
diff --git a/packages/ses/test/anticipate-async-iterator-helpers-shimmed.test.js b/packages/ses/test/anticipate-async-iterator-helpers-shimmed.test.js
index 2fd787db4d..ebb2bf93ec 100644
--- a/packages/ses/test/anticipate-async-iterator-helpers-shimmed.test.js
+++ b/packages/ses/test/anticipate-async-iterator-helpers-shimmed.test.js
@@ -1,9 +1,9 @@
 /* global AsyncIterator */
-import './enforce-cjs-strict.js';
-import './core-js-configuration.js';
+import './_enforce-cjs-strict.js';
+import './_core-js-configuration.js';
 import 'core-js/actual/async-iterator/index.js';
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('shimmed async-iterator helpers', async t => {
diff --git a/packages/ses/test/anticipate-iterator-helpers-shimmed.test.js b/packages/ses/test/anticipate-iterator-helpers-shimmed.test.js
index 50424d2732..95ad405c12 100644
--- a/packages/ses/test/anticipate-iterator-helpers-shimmed.test.js
+++ b/packages/ses/test/anticipate-iterator-helpers-shimmed.test.js
@@ -1,9 +1,9 @@
 /* global Iterator */
-import './enforce-cjs-strict.js';
-import './core-js-configuration.js';
+import './_enforce-cjs-strict.js';
+import './_core-js-configuration.js';
 import 'core-js/actual/iterator/index.js';
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('shimmed iterator helpers', t => {
diff --git a/packages/ses/test/backslash-u-identifier.test.js b/packages/ses/test/backslash-u-identifier.test.js
index 9a08851de6..51ee162abf 100644
--- a/packages/ses/test/backslash-u-identifier.test.js
+++ b/packages/ses/test/backslash-u-identifier.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('backslash-u-varname', t => {
diff --git a/packages/ses/test/break-function-eval.test.js b/packages/ses/test/break-function-eval.test.js
index 7728edbca6..28a2c5c0ac 100644
--- a/packages/ses/test/break-function-eval.test.js
+++ b/packages/ses/test/break-function-eval.test.js
@@ -1,7 +1,7 @@
 /* global globalThis */
 
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('function-no-body', t => {
diff --git a/packages/ses/test/compartment-transforms.test.js b/packages/ses/test/compartment-transforms.test.js
index bdc0b01e2e..e5492ec431 100644
--- a/packages/ses/test/compartment-transforms.test.js
+++ b/packages/ses/test/compartment-transforms.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import { ModuleSource } from '@endo/module-source';
 // Placing the ava import last demonstrates that ava itself is compatible with SES
 import test from 'ava';
diff --git a/packages/ses/test/confinement.test.js b/packages/ses/test/confinement.test.js
index 7573bd5a3a..592aeec50b 100644
--- a/packages/ses/test/confinement.test.js
+++ b/packages/ses/test/confinement.test.js
@@ -1,7 +1,7 @@
 /* global globalThis */
 
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('confinement evaluation strict mode', t => {
diff --git a/packages/ses/test/console-error-trap.test.js b/packages/ses/test/console-error-trap.test.js
index 2ccb633d72..26fb3a807d 100644
--- a/packages/ses/test/console-error-trap.test.js
+++ b/packages/ses/test/console-error-trap.test.js
@@ -2,7 +2,7 @@ import test from 'ava';
 import url from 'url';
 import { exec } from 'child_process';
 
-const cwd = url.fileURLToPath(new URL('console-error-trap', import.meta.url));
+const cwd = url.fileURLToPath(new URL('_console-error-trap', import.meta.url));
 
 const exitAssertions = (
   t,
diff --git a/packages/ses/test/console-rejection-trap.test.js b/packages/ses/test/console-rejection-trap.test.js
index 1ebfc536c8..d64dff589c 100644
--- a/packages/ses/test/console-rejection-trap.test.js
+++ b/packages/ses/test/console-rejection-trap.test.js
@@ -3,7 +3,7 @@ import url from 'url';
 import { exec } from 'child_process';
 
 const cwd = url.fileURLToPath(
-  new URL('console-rejection-trap', import.meta.url),
+  new URL('_console-rejection-trap', import.meta.url),
 );
 
 const exitAssertions = (
diff --git a/packages/ses/test/enable-property-overrides-default-unsafeError.test.js b/packages/ses/test/enable-property-overrides-default-unsafeError.test.js
index 0c6087cbfe..4493c931ec 100644
--- a/packages/ses/test/enable-property-overrides-default-unsafeError.test.js
+++ b/packages/ses/test/enable-property-overrides-default-unsafeError.test.js
@@ -1,6 +1,6 @@
 import '../index.js';
 import test from 'ava';
-import { overrideTester } from './override-tester.js';
+import { overrideTester } from './_override-tester.js';
 
 lockdown({
   errorTaming: 'unsafe',
diff --git a/packages/ses/test/enable-property-overrides-default.test.js b/packages/ses/test/enable-property-overrides-default.test.js
index 9037f9ef4a..710a4dd39e 100644
--- a/packages/ses/test/enable-property-overrides-default.test.js
+++ b/packages/ses/test/enable-property-overrides-default.test.js
@@ -1,6 +1,6 @@
 import '../index.js';
 import test from 'ava';
-import { overrideTester } from './override-tester.js';
+import { overrideTester } from './_override-tester.js';
 
 lockdown({
   errorTaming: 'safe',
diff --git a/packages/ses/test/enable-property-overrides-min-unsafeError.test.js b/packages/ses/test/enable-property-overrides-min-unsafeError.test.js
index df19655c78..b462cfcc46 100644
--- a/packages/ses/test/enable-property-overrides-min-unsafeError.test.js
+++ b/packages/ses/test/enable-property-overrides-min-unsafeError.test.js
@@ -1,6 +1,6 @@
 import '../index.js';
 import test from 'ava';
-import { overrideTester } from './override-tester.js';
+import { overrideTester } from './_override-tester.js';
 
 lockdown({
   errorTaming: 'unsafe',
diff --git a/packages/ses/test/enable-property-overrides-min.test.js b/packages/ses/test/enable-property-overrides-min.test.js
index 54c87325b1..9c607c72cf 100644
--- a/packages/ses/test/enable-property-overrides-min.test.js
+++ b/packages/ses/test/enable-property-overrides-min.test.js
@@ -1,6 +1,6 @@
 import '../index.js';
 import test from 'ava';
-import { overrideTester } from './override-tester.js';
+import { overrideTester } from './_override-tester.js';
 
 lockdown({
   errorTaming: 'safe',
diff --git a/packages/ses/test/enable-property-overrides-severe-debug.test.js b/packages/ses/test/enable-property-overrides-severe-debug.test.js
index 4f3af639f8..1ae81cf386 100644
--- a/packages/ses/test/enable-property-overrides-severe-debug.test.js
+++ b/packages/ses/test/enable-property-overrides-severe-debug.test.js
@@ -1,6 +1,6 @@
 import '../index.js';
 import test from 'ava';
-import { overrideTester } from './override-tester.js';
+import { overrideTester } from './_override-tester.js';
 
 lockdown({
   overrideTaming: 'severe',
diff --git a/packages/ses/test/enable-property-overrides-severe.test.js b/packages/ses/test/enable-property-overrides-severe.test.js
index dd27e2ea53..570b3f3220 100644
--- a/packages/ses/test/enable-property-overrides-severe.test.js
+++ b/packages/ses/test/enable-property-overrides-severe.test.js
@@ -1,6 +1,6 @@
 import '../index.js';
 import test from 'ava';
-import { overrideTester } from './override-tester.js';
+import { overrideTester } from './_override-tester.js';
 
 lockdown({ overrideTaming: 'severe', __hardenTaming__: 'safe' });
 
diff --git a/packages/ses/test/error/throws-and-logs.js b/packages/ses/test/error/_throws-and-logs.js
similarity index 100%
rename from packages/ses/test/error/throws-and-logs.js
rename to packages/ses/test/error/_throws-and-logs.js
diff --git a/packages/ses/test/error/aggregate-error-console.test.js b/packages/ses/test/error/aggregate-error-console.test.js
index ba192546be..e9981c4fe9 100644
--- a/packages/ses/test/error/aggregate-error-console.test.js
+++ b/packages/ses/test/error/aggregate-error-console.test.js
@@ -1,6 +1,6 @@
 import test from 'ava';
 import '../../index.js';
-import { throwsAndLogs } from './throws-and-logs.js';
+import { throwsAndLogs } from './_throws-and-logs.js';
 
 lockdown();
 
diff --git a/packages/ses/test/error/assert-log.test.js b/packages/ses/test/error/assert-log.test.js
index 76b82d9948..ecd2c67092 100644
--- a/packages/ses/test/error/assert-log.test.js
+++ b/packages/ses/test/error/assert-log.test.js
@@ -1,5 +1,5 @@
 import test from 'ava';
-import { assertLogs, throwsAndLogs } from './throws-and-logs.js';
+import { assertLogs, throwsAndLogs } from './_throws-and-logs.js';
 import { assert } from '../../src/error/assert.js';
 
 const { details: X, quote: q, bare: b, error: makeError } = assert;
diff --git a/packages/ses/test/error/error-cause-console.test.js b/packages/ses/test/error/error-cause-console.test.js
index 323558d229..0df0787370 100644
--- a/packages/ses/test/error/error-cause-console.test.js
+++ b/packages/ses/test/error/error-cause-console.test.js
@@ -1,6 +1,6 @@
 import test from 'ava';
 import '../../index.js';
-import { throwsAndLogs } from './throws-and-logs.js';
+import { throwsAndLogs } from './_throws-and-logs.js';
 
 lockdown();
 
diff --git a/packages/ses/test/error/filtering-console.test.js b/packages/ses/test/error/filtering-console.test.js
index 745548b1a1..656df09a9e 100644
--- a/packages/ses/test/error/filtering-console.test.js
+++ b/packages/ses/test/error/filtering-console.test.js
@@ -1,7 +1,7 @@
 import test from 'ava';
 import '../../index.js';
 import { filterConsole } from '../../src/error/console.js';
-import { assertLogs } from './throws-and-logs.js';
+import { assertLogs } from './_throws-and-logs.js';
 
 lockdown();
 
diff --git a/packages/ses/test/error/permit-removal-warnings.test.js b/packages/ses/test/error/permit-removal-warnings.test.js
index ab83b430f9..16f1acc496 100644
--- a/packages/ses/test/error/permit-removal-warnings.test.js
+++ b/packages/ses/test/error/permit-removal-warnings.test.js
@@ -1,6 +1,6 @@
 import test from 'ava';
 import '../../index.js';
-import { assertLogs } from './throws-and-logs.js';
+import { assertLogs } from './_throws-and-logs.js';
 
 const { defineProperties } = Object;
 const { apply } = Reflect;
diff --git a/packages/ses/test/evade-html-comment.test.js b/packages/ses/test/evade-html-comment.test.js
index d93dd29f23..8038e596af 100644
--- a/packages/ses/test/evade-html-comment.test.js
+++ b/packages/ses/test/evade-html-comment.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 const opt = harden({ __evadeHtmlCommentTest__: true });
diff --git a/packages/ses/test/evade-import-expression.test.js b/packages/ses/test/evade-import-expression.test.js
index ca36fe4165..960ebd06da 100644
--- a/packages/ses/test/evade-import-expression.test.js
+++ b/packages/ses/test/evade-import-expression.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 const opt = harden({ __evadeImportExpressionTest__: true });
diff --git a/packages/ses/test/global-object-mutability.test.js b/packages/ses/test/global-object-mutability.test.js
index 2443deac17..e53daa2e01 100644
--- a/packages/ses/test/global-object-mutability.test.js
+++ b/packages/ses/test/global-object-mutability.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('globalObject properties mutable', t => {
diff --git a/packages/ses/test/global-object-properties.test.js b/packages/ses/test/global-object-properties.test.js
index e35c4c3038..b175dc402f 100644
--- a/packages/ses/test/global-object-properties.test.js
+++ b/packages/ses/test/global-object-properties.test.js
@@ -1,7 +1,7 @@
 /* global globalThis */
 
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('globalObject properties', t => {
diff --git a/packages/ses/test/global-object.test.js b/packages/ses/test/global-object.test.js
index babba4d9fe..06e13828ec 100644
--- a/packages/ses/test/global-object.test.js
+++ b/packages/ses/test/global-object.test.js
@@ -1,7 +1,7 @@
 /* global globalThis */
 
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 import {
   setGlobalObjectConstantProperties,
diff --git a/packages/ses/test/identity-continuity.test.js b/packages/ses/test/identity-continuity.test.js
index 2f20d04e62..a20b3e1597 100644
--- a/packages/ses/test/identity-continuity.test.js
+++ b/packages/ses/test/identity-continuity.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 // Array is a shared global
diff --git a/packages/ses/test/import-cjs.test.js b/packages/ses/test/import-cjs.test.js
index 8821331c17..6e941b4e7b 100644
--- a/packages/ses/test/import-cjs.test.js
+++ b/packages/ses/test/import-cjs.test.js
@@ -1,6 +1,6 @@
 import test from 'ava';
 import { ModuleSource } from '@endo/module-source';
-import { resolveNode } from './node.js';
+import { resolveNode } from './_node.js';
 import '../index.js';
 import { freeze, keys } from '../src/commons.js';
 
diff --git a/packages/ses/test/import-gauntlet.test.js b/packages/ses/test/import-gauntlet.test.js
index 1ed87f1118..3cd2b97c21 100644
--- a/packages/ses/test/import-gauntlet.test.js
+++ b/packages/ses/test/import-gauntlet.test.js
@@ -3,7 +3,7 @@
 
 import test from 'ava';
 import '../index.js';
-import { resolveNode, makeNodeImporter } from './node.js';
+import { resolveNode, makeNodeImporter } from './_node.js';
 
 test('import for side effect', async t => {
   t.plan(0);
diff --git a/packages/ses/test/import-legacy.test.js b/packages/ses/test/import-legacy.test.js
index fa08cb231f..fb021ad2cc 100644
--- a/packages/ses/test/import-legacy.test.js
+++ b/packages/ses/test/import-legacy.test.js
@@ -5,8 +5,8 @@
 
 import test from 'ava';
 import '../index.js';
-import { resolveNode, makeNodeImporter } from './node.js';
-import { makeImporter, makeStaticRetriever } from './import-commons.js';
+import { resolveNode, makeNodeImporter } from './_node.js';
+import { makeImporter, makeStaticRetriever } from './_import-commons.js';
 
 // This test demonstrates a system of modules in a single Compartment
 // that uses fully qualified URLs as module specifiers and module locations,
diff --git a/packages/ses/test/import-non-esm.test.js b/packages/ses/test/import-non-esm.test.js
index 644258e0a1..a5b8b86f15 100644
--- a/packages/ses/test/import-non-esm.test.js
+++ b/packages/ses/test/import-non-esm.test.js
@@ -1,6 +1,6 @@
 import test from 'ava';
 import { ModuleSource } from '@endo/module-source';
-import { resolveNode } from './node.js';
+import { resolveNode } from './_node.js';
 import '../index.js';
 
 test('import a non-ESM', async t => {
diff --git a/packages/ses/test/import-stack-traces.test.js b/packages/ses/test/import-stack-traces.test.js
index fe71f5b771..1b213d3479 100644
--- a/packages/ses/test/import-stack-traces.test.js
+++ b/packages/ses/test/import-stack-traces.test.js
@@ -1,6 +1,6 @@
 import test from 'ava';
 import '../index.js';
-import { resolveNode, makeNodeImporter } from './node.js';
+import { resolveNode, makeNodeImporter } from './_node.js';
 
 test('preserve file names in stack traces', async t => {
   await null;
diff --git a/packages/ses/test/import.test.js b/packages/ses/test/import.test.js
index 85d21c3e4a..86020cc796 100644
--- a/packages/ses/test/import.test.js
+++ b/packages/ses/test/import.test.js
@@ -5,8 +5,8 @@
 
 import test from 'ava';
 import '../index.js';
-import { resolveNode, makeNodeImporter } from './node.js';
-import { makeImporter, makeStaticRetriever } from './import-commons.js';
+import { resolveNode, makeNodeImporter } from './_node.js';
+import { makeImporter, makeStaticRetriever } from './_import-commons.js';
 
 // This test demonstrates a system of modules in a single Compartment
 // that uses fully qualified URLs as module specifiers and module locations,
diff --git a/packages/ses/test/make-eval-function.test.js b/packages/ses/test/make-eval-function.test.js
index 1eb449aaec..11c39a482e 100644
--- a/packages/ses/test/make-eval-function.test.js
+++ b/packages/ses/test/make-eval-function.test.js
@@ -1,7 +1,7 @@
 /* global globalThis */
 
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 import { makeEvalFunction } from '../src/make-eval-function.js';
 import { makeSafeEvaluator } from '../src/make-safe-evaluator.js';
diff --git a/packages/ses/test/make-function-constructor.test.js b/packages/ses/test/make-function-constructor.test.js
index 3a3e336e10..23aff0af7d 100644
--- a/packages/ses/test/make-function-constructor.test.js
+++ b/packages/ses/test/make-function-constructor.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 import { makeFunctionConstructor } from '../src/make-function-constructor.js';
 import { makeSafeEvaluator } from '../src/make-safe-evaluator.js';
diff --git a/packages/ses/test/make-safe-evaluator.test.js b/packages/ses/test/make-safe-evaluator.test.js
index 687aeba499..db37e0a1e1 100644
--- a/packages/ses/test/make-safe-evaluator.test.js
+++ b/packages/ses/test/make-safe-evaluator.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 import { makeSafeEvaluator } from '../src/make-safe-evaluator.js';
 
diff --git a/packages/ses/test/native-harden.test.js b/packages/ses/test/native-harden.test.js
index 2f7ad50814..235ef69aa3 100644
--- a/packages/ses/test/native-harden.test.js
+++ b/packages/ses/test/native-harden.test.js
@@ -1,5 +1,5 @@
-import { mockHarden, mockHardened } from './harden-mockery.js';
-import { assertFakeFrozen } from './lockdown-harden-unsafe.js';
+import { mockHarden, mockHardened } from './_harden-mockery.js';
+import { assertFakeFrozen } from './_lockdown-harden-unsafe.js';
 
 // eslint-disable-next-line import/order
 import test from 'ava';
diff --git a/packages/ses/test/no-direct-eval.test.js b/packages/ses/test/no-direct-eval.test.js
index 5da3a68f5f..ed8124c1e8 100644
--- a/packages/ses/test/no-direct-eval.test.js
+++ b/packages/ses/test/no-direct-eval.test.js
@@ -1,5 +1,5 @@
 import test from 'ava';
-import './no-direct-eval.js';
+import './_no-direct-eval.js';
 import '../index.js';
 
 test('lockdown must throw if dynamic eval is unavailable at initialization time', t => {
diff --git a/packages/ses/test/no-eval.test.js b/packages/ses/test/no-eval.test.js
index b2017b19bf..6ce63f0c48 100644
--- a/packages/ses/test/no-eval.test.js
+++ b/packages/ses/test/no-eval.test.js
@@ -1,5 +1,5 @@
 import test from 'ava';
-import './no-eval.js';
+import './_no-eval.js';
 import '../index.js';
 
 // I've manually verified that this is not failing due to the dynamic-eval
diff --git a/packages/ses/test/node.test.js b/packages/ses/test/node.test.js
index ba5865138e..574a7ba526 100644
--- a/packages/ses/test/node.test.js
+++ b/packages/ses/test/node.test.js
@@ -1,5 +1,5 @@
 import test from 'ava';
-import { resolveNode as resolve } from './node.js';
+import { resolveNode as resolve } from './_node.js';
 
 const q = JSON.stringify;
 
diff --git a/packages/ses/test/package.test.js b/packages/ses/test/package.test.js
index d7949d2326..60ff7b2a74 100644
--- a/packages/ses/test/package.test.js
+++ b/packages/ses/test/package.test.js
@@ -2,7 +2,7 @@ import test from 'ava';
 import url from 'url';
 import { spawn } from 'child_process';
 
-const cwd = url.fileURLToPath(new URL('package/', import.meta.url));
+const cwd = url.fileURLToPath(new URL('_package/', import.meta.url));
 
 const table = {
   cjs: {
diff --git a/packages/ses/test/reject-direct-eval.test.js b/packages/ses/test/reject-direct-eval.test.js
index 3f06f794cf..e26fb12982 100644
--- a/packages/ses/test/reject-direct-eval.test.js
+++ b/packages/ses/test/reject-direct-eval.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('reject direct eval expressions in evaluate', t => {
diff --git a/packages/ses/test/reject-html-comment.test.js b/packages/ses/test/reject-html-comment.test.js
index fcf687ef0e..26fd209aad 100644
--- a/packages/ses/test/reject-html-comment.test.js
+++ b/packages/ses/test/reject-html-comment.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('reject HTML comment expressions in evaluate', t => {
diff --git a/packages/ses/test/reject-import-expression.test.js b/packages/ses/test/reject-import-expression.test.js
index 6696381389..ec804262fa 100644
--- a/packages/ses/test/reject-import-expression.test.js
+++ b/packages/ses/test/reject-import-expression.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('reject import expressions in evaluate', t => {
diff --git a/packages/ses/test/suppress-direct-eval.test.js b/packages/ses/test/suppress-direct-eval.test.js
index c6f4bfbc67..694db687b4 100644
--- a/packages/ses/test/suppress-direct-eval.test.js
+++ b/packages/ses/test/suppress-direct-eval.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 const opt = harden({ __rejectSomeDirectEvalExpressions__: false });
diff --git a/packages/ses/test/tame-function-unit.test.js b/packages/ses/test/tame-function-unit.test.js
index 8445b6d1f5..7ad30e5b92 100644
--- a/packages/ses/test/tame-function-unit.test.js
+++ b/packages/ses/test/tame-function-unit.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('Function.prototype.constructor', t => {
diff --git a/packages/ses/test/tame-harden.test.js b/packages/ses/test/tame-harden.test.js
index c95bf28079..4bb8a1b958 100644
--- a/packages/ses/test/tame-harden.test.js
+++ b/packages/ses/test/tame-harden.test.js
@@ -1,4 +1,4 @@
-import { assertFakeFrozen } from './lockdown-harden-unsafe.js';
+import { assertFakeFrozen } from './_lockdown-harden-unsafe.js';
 // eslint-disable-next-line import/order
 import test from 'ava';
 
diff --git a/packages/ses/test/typeof.test.js b/packages/ses/test/typeof.test.js
index 2f857d05a8..436857affa 100644
--- a/packages/ses/test/typeof.test.js
+++ b/packages/ses/test/typeof.test.js
@@ -1,5 +1,5 @@
 import '../index.js';
-import './lockdown-safe.js';
+import './_lockdown-safe.js';
 import test from 'ava';
 
 test('typeof', t => {
diff --git a/packages/skel/package.json b/packages/skel/package.json
index 1967766953..4c31f30e68 100644
--- a/packages/skel/package.json
+++ b/packages/skel/package.json
@@ -64,7 +64,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/stream-node/package.json b/packages/stream-node/package.json
index 4040b36672..90e8eb3aa4 100644
--- a/packages/stream-node/package.json
+++ b/packages/stream-node/package.json
@@ -81,7 +81,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/stream/package.json b/packages/stream/package.json
index 11af05dfae..19c43d5425 100644
--- a/packages/stream/package.json
+++ b/packages/stream/package.json
@@ -84,7 +84,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/syrup/package.json b/packages/syrup/package.json
index aef8c409c2..2beb862a7a 100644
--- a/packages/syrup/package.json
+++ b/packages/syrup/package.json
@@ -69,7 +69,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/syrup/test/table.js b/packages/syrup/test/_table.js
similarity index 100%
rename from packages/syrup/test/table.js
rename to packages/syrup/test/_table.js
diff --git a/packages/syrup/test/xorshift.js b/packages/syrup/test/_xorshift.js
similarity index 100%
rename from packages/syrup/test/xorshift.js
rename to packages/syrup/test/_xorshift.js
diff --git a/packages/syrup/test/decode.test.js b/packages/syrup/test/decode.test.js
index 237ba431b6..922f349d54 100644
--- a/packages/syrup/test/decode.test.js
+++ b/packages/syrup/test/decode.test.js
@@ -2,7 +2,7 @@
 
 import test from 'ava';
 import { decodeSyrup } from '../src/decode.js';
-import { table } from './table.js';
+import { table } from './_table.js';
 
 const textEncoder = new TextEncoder();
 
diff --git a/packages/syrup/test/encode.test.js b/packages/syrup/test/encode.test.js
index ad33800451..79d550cdb5 100644
--- a/packages/syrup/test/encode.test.js
+++ b/packages/syrup/test/encode.test.js
@@ -2,7 +2,7 @@
 
 import test from 'ava';
 import { encodeSyrup } from '../src/encode.js';
-import { table } from './table.js';
+import { table } from './_table.js';
 
 test('affirmative encode cases', t => {
   for (const { syrup, value } of table) {
diff --git a/packages/syrup/test/fuzz.test.js b/packages/syrup/test/fuzz.test.js
index 6fbca5d042..cc0166aab6 100644
--- a/packages/syrup/test/fuzz.test.js
+++ b/packages/syrup/test/fuzz.test.js
@@ -3,7 +3,7 @@
 import test from 'ava';
 import { decodeSyrup } from '../src/decode.js';
 import { encodeSyrup } from '../src/encode.js';
-import { XorShift } from './xorshift.js';
+import { XorShift } from './_xorshift.js';
 
 /**
  * @param {number} budget
diff --git a/packages/where/package.json b/packages/where/package.json
index 8ce5317e4d..2178fccd63 100644
--- a/packages/where/package.json
+++ b/packages/where/package.json
@@ -69,7 +69,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/packages/zip/package.json b/packages/zip/package.json
index 25de17311b..77b301f5ca 100644
--- a/packages/zip/package.json
+++ b/packages/zip/package.json
@@ -70,7 +70,6 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.*",
       "test/**/*.test.*"
     ],
     "timeout": "2m"
diff --git a/scripts/migrate-test-imports.mjs b/scripts/migrate-test-imports.mjs
new file mode 100755
index 0000000000..e35a2591b0
--- /dev/null
+++ b/scripts/migrate-test-imports.mjs
@@ -0,0 +1,70 @@
+#!/usr/bin/env zx
+/**
+ * @file Rename files used in tests that aren't tests themselves.
+ *
+ * This puts an underscore prefix on all files that aren't tests so that Ava's
+ * default glob won't try to run them.
+ *
+ * It also updates `import` lines, but misses `new URL()` calls which Endo tests
+ * often use. We dropped the goal of fully migrating to `_` so didn't put more
+ * time into this script, but it's here for reference.
+ */
+const fsp = require('fs').promises;
+const path = require('path');
+
+// Function to handle renaming and updating imports
+async function processFile(filename) {
+  const fileDir = path.dirname(filename);
+  const baseName = path.basename(filename);
+  const newFileName = `_${baseName}`;
+
+  const oldFilePath = path.join(fileDir, baseName);
+  const newFilePath = path.join(fileDir, newFileName);
+
+  // Rename the file by prepending '_'
+  await fsp.rename(oldFilePath, newFilePath);
+
+  // Read all the files in the directory
+  const files = await fsp.readdir(fileDir);
+
+  // Loop through each file in the directory
+  for (const file of files) {
+    const filePath = path.join(fileDir, file);
+
+    // Check if the file is a .js file and not the renamed file
+    if (file !== newFileName && path.extname(file) === '.js') {
+      // Read the content of the file
+      let content = await fsp.readFile(filePath, 'utf8');
+
+      // Use a regex to update the import path from the original file to the new file
+      const regex = new RegExp(`(['"\`])\\./${baseName}\\1`, 'g');
+      content = content.replace(regex, `$1./_${baseName}$1`);
+
+      // Write the updated content back to the file
+      await fsp.writeFile(filePath, content, 'utf8');
+    }
+  }
+}
+
+// Read filenames from stdin
+(async () => {
+  const stdin = process.stdin;
+  stdin.setEncoding('utf8');
+
+  let inputData = '';
+
+  // Collect all data from stdin
+  stdin.on('data', chunk => {
+    inputData += chunk;
+  });
+
+  stdin.on('end', async () => {
+    // Split input into lines (each line represents a filename)
+    const filenames = inputData.split('\n').filter(Boolean);
+
+    // Process each file
+    for (const filename of filenames) {
+      await processFile(filename);
+    }
+  });
+})();