From 517f9af63034d847fe7b061d0c885a5fbddae319 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 16 Aug 2023 07:55:48 -0400
Subject: [PATCH 1/6] test: cleanup ses-debug

---
 packages/internal/src/install-ses-debug.js            | 2 +-
 packages/swingset-liveslots/tools/prepare-test-env.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/internal/src/install-ses-debug.js b/packages/internal/src/install-ses-debug.js
index 38f01dd9d12..087b58b0c0f 100644
--- a/packages/internal/src/install-ses-debug.js
+++ b/packages/internal/src/install-ses-debug.js
@@ -3,4 +3,4 @@
 // The setting below are *unsafe* and should not be used in contact with
 // genuinely malicious code.
 
-export * from '@endo/init/debug.js';
+import '@endo/init/debug.js';
diff --git a/packages/swingset-liveslots/tools/prepare-test-env.js b/packages/swingset-liveslots/tools/prepare-test-env.js
index 5f96f8c7545..d76947a22c3 100644
--- a/packages/swingset-liveslots/tools/prepare-test-env.js
+++ b/packages/swingset-liveslots/tools/prepare-test-env.js
@@ -5,9 +5,8 @@
  * and stores.
  */
 
-import '@endo/init/pre.js';
-
 import '@agoric/internal/src/install-ses-debug.js';
+
 import { reincarnate } from './setup-vat-data.js';
 
 // Install the VatData globals.

From e7a12dcffe8e9f7629517467344a394f12ea553e Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 16 Aug 2023 08:02:50 -0400
Subject: [PATCH 2/6] test: always init Endo

except agoric-cli and casting which have to shim 'fetch'
---
 packages/ERTP/package.json                      | 3 +++
 packages/SwingSet/package.json                  | 3 +++
 packages/access-token/package.json              | 3 +++
 packages/assert/package.json                    | 5 +++++
 packages/base-zone/package.json                 | 3 +++
 packages/boot/package.json                      | 3 +++
 packages/builders/package.json                  | 3 +++
 packages/cache/package.json                     | 3 +++
 packages/cosmic-swingset/package.json           | 3 +++
 packages/deploy-script-support/package.json     | 3 +++
 packages/governance/package.json                | 3 +++
 packages/inter-protocol/package.json            | 3 +++
 packages/internal/package.json                  | 5 +++++
 packages/network/package.json                   | 3 +++
 packages/notifier/package.json                  | 3 +++
 packages/pegasus/package.json                   | 3 +++
 packages/smart-wallet/package.json              | 3 +++
 packages/solo/package.json                      | 3 +++
 packages/spawner/package.json                   | 3 +++
 packages/store/package.json                     | 3 +++
 packages/swing-store/package.json               | 3 +++
 packages/swingset-liveslots/package.json        | 3 +++
 packages/swingset-runner/package.json           | 3 +++
 packages/swingset-xsnap-supervisor/package.json | 3 +++
 packages/telemetry/package.json                 | 3 +++
 packages/time/package.json                      | 5 +++++
 packages/vat-data/package.json                  | 5 +++++
 packages/vats/package.json                      | 3 +++
 packages/vm-config/package.json                 | 3 +++
 packages/wallet/api/package.json                | 3 +++
 packages/xsnap-lockdown/package.json            | 3 +++
 packages/xsnap/package.json                     | 3 +++
 packages/zoe/package.json                       | 3 +++
 packages/zone/package.json                      | 3 +++
 34 files changed, 110 insertions(+)

diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
index 8c8324c3710..f49e89c4e87 100644
--- a/packages/ERTP/package.json
+++ b/packages/ERTP/package.json
@@ -74,6 +74,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "5m"
   },
   "publishConfig": {
diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
index 009064b6ac2..bf9f0ec69ff 100644
--- a/packages/SwingSet/package.json
+++ b/packages/SwingSet/package.json
@@ -88,6 +88,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   },
diff --git a/packages/access-token/package.json b/packages/access-token/package.json
index b4c098aa471..e39077d5bb8 100644
--- a/packages/access-token/package.json
+++ b/packages/access-token/package.json
@@ -31,6 +31,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 535f1924795..8bb362557b6 100755
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -21,6 +21,11 @@
     "@endo/init": "^0.5.57",
     "ava": "^5.3.0"
   },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ]
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Agoric/agoric-sdk.git"
diff --git a/packages/base-zone/package.json b/packages/base-zone/package.json
index 4ea1898453d..392a4661ae6 100644
--- a/packages/base-zone/package.json
+++ b/packages/base-zone/package.json
@@ -46,6 +46,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/boot/package.json b/packages/boot/package.json
index 4270d045843..03fb4133e0d 100644
--- a/packages/boot/package.json
+++ b/packages/boot/package.json
@@ -66,6 +66,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/builders/package.json b/packages/builders/package.json
index aecf3059c19..e84adc481b8 100644
--- a/packages/builders/package.json
+++ b/packages/builders/package.json
@@ -72,6 +72,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/cache/package.json b/packages/cache/package.json
index 20419064f67..a96b205c8f8 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -42,6 +42,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m"
   }
 }
diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json
index 02f1126e12c..ed90d8cd663 100644
--- a/packages/cosmic-swingset/package.json
+++ b/packages/cosmic-swingset/package.json
@@ -61,6 +61,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m"
   }
 }
diff --git a/packages/deploy-script-support/package.json b/packages/deploy-script-support/package.json
index ae94137481e..701e8184ed5 100644
--- a/packages/deploy-script-support/package.json
+++ b/packages/deploy-script-support/package.json
@@ -64,6 +64,9 @@
   "ava": {
     "files": [
       "test/**/test-*.js"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ]
   },
   "publishConfig": {
diff --git a/packages/governance/package.json b/packages/governance/package.json
index 683925e631b..8d04522ede2 100644
--- a/packages/governance/package.json
+++ b/packages/governance/package.json
@@ -67,6 +67,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "10m"
   },
   "publishConfig": {
diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json
index 19d0b46174a..b195c72c839 100644
--- a/packages/inter-protocol/package.json
+++ b/packages/inter-protocol/package.json
@@ -73,6 +73,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "workerThreads": false,
     "timeout": "10m"
   },
diff --git a/packages/internal/package.json b/packages/internal/package.json
index 69ad78f1fe8..67777322f3e 100755
--- a/packages/internal/package.json
+++ b/packages/internal/package.json
@@ -36,6 +36,11 @@
     "ava": "^5.3.0",
     "tsd": "^0.28.1"
   },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ]
+  },
   "author": "Agoric",
   "license": "Apache-2.0",
   "files": [
diff --git a/packages/network/package.json b/packages/network/package.json
index fd600b21007..15924c083d5 100644
--- a/packages/network/package.json
+++ b/packages/network/package.json
@@ -57,6 +57,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/notifier/package.json b/packages/notifier/package.json
index f302c5ed0a1..23a21ef028b 100644
--- a/packages/notifier/package.json
+++ b/packages/notifier/package.json
@@ -69,6 +69,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/pegasus/package.json b/packages/pegasus/package.json
index 2e8017f2b74..4c6a161cc6a 100644
--- a/packages/pegasus/package.json
+++ b/packages/pegasus/package.json
@@ -59,6 +59,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "10m"
   },
   "publishConfig": {
diff --git a/packages/smart-wallet/package.json b/packages/smart-wallet/package.json
index 783af1a2e4a..764ddb57070 100644
--- a/packages/smart-wallet/package.json
+++ b/packages/smart-wallet/package.json
@@ -58,6 +58,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   },
   "publishConfig": {
diff --git a/packages/solo/package.json b/packages/solo/package.json
index e606b0f1a3d..5efba00a22c 100644
--- a/packages/solo/package.json
+++ b/packages/solo/package.json
@@ -71,6 +71,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/spawner/package.json b/packages/spawner/package.json
index 4db396e660b..82fa58912e0 100644
--- a/packages/spawner/package.json
+++ b/packages/spawner/package.json
@@ -55,6 +55,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/store/package.json b/packages/store/package.json
index b5f7e5506a3..e8acbb48249 100644
--- a/packages/store/package.json
+++ b/packages/store/package.json
@@ -54,6 +54,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/swing-store/package.json b/packages/swing-store/package.json
index a222a93d2fd..a88053900bb 100644
--- a/packages/swing-store/package.json
+++ b/packages/swing-store/package.json
@@ -43,6 +43,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/swingset-liveslots/package.json b/packages/swingset-liveslots/package.json
index 5deb0980765..eeba088334f 100644
--- a/packages/swingset-liveslots/package.json
+++ b/packages/swingset-liveslots/package.json
@@ -54,6 +54,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   },
diff --git a/packages/swingset-runner/package.json b/packages/swingset-runner/package.json
index 6f35a9d505b..9fa9237983c 100644
--- a/packages/swingset-runner/package.json
+++ b/packages/swingset-runner/package.json
@@ -50,6 +50,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/swingset-xsnap-supervisor/package.json b/packages/swingset-xsnap-supervisor/package.json
index cdaa82a3fa6..937dee4d9db 100644
--- a/packages/swingset-xsnap-supervisor/package.json
+++ b/packages/swingset-xsnap-supervisor/package.json
@@ -45,6 +45,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m",
     "workerThreads": false
   }
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
index 1baa7afee44..e3f83e24fdc 100644
--- a/packages/telemetry/package.json
+++ b/packages/telemetry/package.json
@@ -57,6 +57,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/time/package.json b/packages/time/package.json
index 66773cce889..f2fcb37969e 100644
--- a/packages/time/package.json
+++ b/packages/time/package.json
@@ -39,6 +39,11 @@
     "@endo/init": "^0.5.57",
     "ava": "^5.3.0"
   },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ]
+  },
   "files": [
     "*.js",
     "NEWS.md",
diff --git a/packages/vat-data/package.json b/packages/vat-data/package.json
index 11b2d03b9f7..b824afca256 100644
--- a/packages/vat-data/package.json
+++ b/packages/vat-data/package.json
@@ -29,6 +29,11 @@
     "ava": "^5.3.0",
     "tsd": "^0.28.1"
   },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ]
+  },
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vats/package.json b/packages/vats/package.json
index 1a34ab47176..920775c6f40 100644
--- a/packages/vats/package.json
+++ b/packages/vats/package.json
@@ -68,6 +68,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/vm-config/package.json b/packages/vm-config/package.json
index 3eda8b23153..41d5beaa317 100644
--- a/packages/vm-config/package.json
+++ b/packages/vm-config/package.json
@@ -42,6 +42,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }
diff --git a/packages/wallet/api/package.json b/packages/wallet/api/package.json
index 46aafcc66ab..23b1a49c796 100644
--- a/packages/wallet/api/package.json
+++ b/packages/wallet/api/package.json
@@ -53,6 +53,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m",
     "workerThreads": false
   },
diff --git a/packages/xsnap-lockdown/package.json b/packages/xsnap-lockdown/package.json
index d7a3a8b9ecd..2374f98adde 100644
--- a/packages/xsnap-lockdown/package.json
+++ b/packages/xsnap-lockdown/package.json
@@ -40,6 +40,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m",
     "workerThreads": false
   }
diff --git a/packages/xsnap/package.json b/packages/xsnap/package.json
index 7387ea0130a..55544e3f1da 100644
--- a/packages/xsnap/package.json
+++ b/packages/xsnap/package.json
@@ -59,6 +59,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m",
     "workerThreads": false
   }
diff --git a/packages/zoe/package.json b/packages/zoe/package.json
index 452c983bdad..3c89f99ba79 100644
--- a/packages/zoe/package.json
+++ b/packages/zoe/package.json
@@ -125,6 +125,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m"
   },
   "publishConfig": {
diff --git a/packages/zone/package.json b/packages/zone/package.json
index efebbfed406..6610346f4b1 100644
--- a/packages/zone/package.json
+++ b/packages/zone/package.json
@@ -47,6 +47,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }

From 9159a53890a1a1c3817450ce200694ed49770a59 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 16 Aug 2023 07:57:43 -0400
Subject: [PATCH 3/6] test: remove endo/init/debug

---
 packages/SwingSet/test/test-bundle-handler.js                   | 1 -
 packages/SwingSet/test/test-xsnap-store.js                      | 1 -
 packages/SwingSet/test/transcript/test-state-sync-reload.js     | 1 -
 packages/SwingSet/test/transcript/test-transcript-entries.js    | 1 -
 packages/SwingSet/test/virtualObjects/test-facet-retention.js   | 1 -
 .../SwingSet/test/xsnap-stable-bundles/test-stable-bundles.js   | 1 -
 packages/base-zone/test/prepare-test-env-ava.js                 | 1 -
 packages/cosmic-swingset/test/test-clean-core-eval.js           | 1 -
 packages/cosmic-swingset/test/test-provision-smartwallet.js     | 1 -
 .../test/swingsetTests/committeeBinary/test-committee.js        | 1 -
 .../test/swingsetTests/contractGovernor/test-governor.js        | 1 -
 packages/inter-protocol/test/vaultFactory/test-storeUtils.js    | 2 --
 packages/internal/test/test-netstring.js                        | 1 -
 packages/internal/test/test-priority-senders.js                 | 1 -
 packages/internal/test/test-storage-test-utils.js               | 1 -
 packages/store/test/perf-patterns.js                            | 2 --
 packages/store/test/prepare-test-env-ava.js                     | 2 --
 packages/store/test/test-AtomicProvider.js                      | 1 -
 packages/store/test/test-store.js                               | 1 -
 packages/swing-store/test/test-bundles.js                       | 1 -
 packages/swing-store/test/test-deletion.js                      | 1 -
 packages/swing-store/test/test-export.js                        | 2 --
 packages/swing-store/test/test-exportImport.js                  | 1 -
 packages/swing-store/test/test-hasher.js                        | 1 -
 packages/swing-store/test/test-import.js                        | 2 --
 packages/swing-store/test/test-repair-metadata.js               | 2 --
 packages/swing-store/test/test-snapstore.js                     | 1 -
 packages/swing-store/test/test-state.js                         | 2 --
 packages/swingset-liveslots/test/storeGC/test-lifecycle.js      | 1 -
 .../swingset-liveslots/test/storeGC/test-refcount-management.js | 1 -
 .../swingset-liveslots/test/storeGC/test-scalar-store-kind.js   | 1 -
 packages/swingset-liveslots/test/storeGC/test-weak-key.js       | 1 -
 packages/swingset-liveslots/test/test-baggage.js                | 1 -
 packages/swingset-liveslots/test/test-cache.js                  | 1 -
 .../swingset-liveslots/test/test-collection-schema-refcount.js  | 1 -
 packages/swingset-liveslots/test/test-collection-upgrade.js     | 1 -
 packages/swingset-liveslots/test/test-collections.js            | 1 -
 .../swingset-liveslots/test/test-dropped-collection-weakrefs.js | 1 -
 packages/swingset-liveslots/test/test-durabilityChecks.js       | 1 -
 packages/swingset-liveslots/test/test-facetiousness.js          | 1 -
 packages/swingset-liveslots/test/test-gc-sensitivity.js         | 1 -
 packages/swingset-liveslots/test/test-handled-promises.js       | 1 -
 packages/swingset-liveslots/test/test-initial-vrefs.js          | 1 -
 packages/swingset-liveslots/test/test-liveslots-mock-gc.js      | 1 -
 packages/swingset-liveslots/test/test-liveslots-real-gc.js      | 1 -
 packages/swingset-liveslots/test/test-liveslots.js              | 1 -
 packages/swingset-liveslots/test/test-vo-test-harness.js        | 1 -
 packages/swingset-liveslots/test/test-vpid-liveslots.js         | 1 -
 .../test/virtual-objects/test-cease-recognition.js              | 1 -
 .../swingset-liveslots/test/virtual-objects/test-cross-facet.js | 1 -
 .../swingset-liveslots/test/virtual-objects/test-empty-data.js  | 1 -
 packages/swingset-liveslots/test/virtual-objects/test-facets.js | 1 -
 .../test/virtual-objects/test-kind-changes.js                   | 1 -
 .../test/virtual-objects/test-reachable-vrefs.js                | 1 -
 .../test/virtual-objects/test-rep-tostring.js                   | 1 -
 .../test/virtual-objects/test-retain-remotable.js               | 1 -
 .../swingset-liveslots/test/virtual-objects/test-state-shape.js | 1 -
 .../test/virtual-objects/test-virtualObjectGC.js                | 1 -
 .../test/virtual-objects/test-virtualObjectManager.js           | 1 -
 .../swingset-liveslots/test/virtual-objects/test-vo-real-gc.js  | 1 -
 .../test/virtual-objects/test-weakcollections-vref-handling.js  | 1 -
 packages/swingset-xsnap-supervisor/test/test-bundle.js          | 1 -
 packages/vat-data/test/absent.test.js                           | 1 -
 packages/vat-data/test/present.test.js                          | 1 -
 packages/vats/test/test-dump.js                                 | 1 -
 packages/vats/test/test-repl.js                                 | 1 -
 packages/xsnap-lockdown/test/test-bundle.js                     | 1 -
 packages/xsnap-lockdown/test/test-inspect.js                    | 1 -
 packages/xsnap/test/test-boot-lockdown.js                       | 2 --
 packages/xsnap/test/test-err-stack.js                           | 2 --
 packages/xsnap/test/test-gc.js                                  | 1 -
 packages/xsnap/test/test-inspect.js                             | 1 -
 packages/xsnap/test/test-replay.js                              | 2 --
 packages/xsnap/test/test-xs-js.js                               | 2 --
 packages/xsnap/test/test-xs-limits.js                           | 2 --
 packages/xsnap/test/test-xs-perf.js                             | 1 -
 packages/xsnap/test/test-xsnap.js                               | 1 -
 .../test/swingsetTests/brokenContracts/test-crashingContract.js | 1 -
 packages/zoe/test/swingsetTests/makeKind/test-makeKind.js       | 1 -
 packages/zoe/test/swingsetTests/offerArgs/test-offerArgs.js     | 1 -
 packages/zoe/test/swingsetTests/privateArgs/test-privateArgs.js | 1 -
 packages/zoe/test/swingsetTests/runMint/test-runMint.js         | 1 -
 packages/zoe/test/swingsetTests/zoe/test-zoe.js                 | 1 -
 83 files changed, 95 deletions(-)

diff --git a/packages/SwingSet/test/test-bundle-handler.js b/packages/SwingSet/test/test-bundle-handler.js
index 5dc879e8f75..6f00d92c195 100644
--- a/packages/SwingSet/test/test-bundle-handler.js
+++ b/packages/SwingSet/test/test-bundle-handler.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 
 import {
diff --git a/packages/SwingSet/test/test-xsnap-store.js b/packages/SwingSet/test/test-xsnap-store.js
index 26d1ceb550e..053cd178826 100644
--- a/packages/SwingSet/test/test-xsnap-store.js
+++ b/packages/SwingSet/test/test-xsnap-store.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* global globalThis */
-import '@endo/init/debug.js';
 
 import { spawn } from 'child_process';
 import fs from 'fs';
diff --git a/packages/SwingSet/test/transcript/test-state-sync-reload.js b/packages/SwingSet/test/transcript/test-state-sync-reload.js
index f42336e591e..1eb72d92580 100644
--- a/packages/SwingSet/test/transcript/test-state-sync-reload.js
+++ b/packages/SwingSet/test/transcript/test-state-sync-reload.js
@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
 import test from 'ava';
-import '@endo/init/debug.js';
 import tmp from 'tmp';
 import {
   initSwingStore,
diff --git a/packages/SwingSet/test/transcript/test-transcript-entries.js b/packages/SwingSet/test/transcript/test-transcript-entries.js
index 42d15c5a43c..636b9a16353 100644
--- a/packages/SwingSet/test/transcript/test-transcript-entries.js
+++ b/packages/SwingSet/test/transcript/test-transcript-entries.js
@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
 import test from 'ava';
-import '@endo/init/debug.js';
 import { initSwingStore } from '@agoric/swing-store';
 import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
 import { buildKernelBundle } from '../../src/controller/initializeSwingset.js';
diff --git a/packages/SwingSet/test/virtualObjects/test-facet-retention.js b/packages/SwingSet/test/virtualObjects/test-facet-retention.js
index 82bfcdf3e97..05d1cc03b4d 100644
--- a/packages/SwingSet/test/virtualObjects/test-facet-retention.js
+++ b/packages/SwingSet/test/virtualObjects/test-facet-retention.js
@@ -1,5 +1,4 @@
 // @ts-nocheck
-import '@endo/init/debug.js';
 import test from 'ava';
 import { initSwingStore } from '@agoric/swing-store';
 import { buildVatController } from '../../src/index.js';
diff --git a/packages/SwingSet/test/xsnap-stable-bundles/test-stable-bundles.js b/packages/SwingSet/test/xsnap-stable-bundles/test-stable-bundles.js
index 70c4ced80b3..35698f23ad1 100644
--- a/packages/SwingSet/test/xsnap-stable-bundles/test-stable-bundles.js
+++ b/packages/SwingSet/test/xsnap-stable-bundles/test-stable-bundles.js
@@ -1,5 +1,4 @@
 // @ts-nocheck
-import '@endo/init/debug.js';
 import test from 'ava';
 import { createHash } from 'crypto';
 
diff --git a/packages/base-zone/test/prepare-test-env-ava.js b/packages/base-zone/test/prepare-test-env-ava.js
index 278ff764af3..c9b920471df 100644
--- a/packages/base-zone/test/prepare-test-env-ava.js
+++ b/packages/base-zone/test/prepare-test-env-ava.js
@@ -1,5 +1,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import '@endo/init/debug.js';
 
 import test from 'ava';
 
diff --git a/packages/cosmic-swingset/test/test-clean-core-eval.js b/packages/cosmic-swingset/test/test-clean-core-eval.js
index 00e97520516..9c0a9717f76 100644
--- a/packages/cosmic-swingset/test/test-clean-core-eval.js
+++ b/packages/cosmic-swingset/test/test-clean-core-eval.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import {
   defangEvaluableCode,
diff --git a/packages/cosmic-swingset/test/test-provision-smartwallet.js b/packages/cosmic-swingset/test/test-provision-smartwallet.js
index 01df5c206cf..2162550fe82 100644
--- a/packages/cosmic-swingset/test/test-provision-smartwallet.js
+++ b/packages/cosmic-swingset/test/test-provision-smartwallet.js
@@ -1,5 +1,4 @@
 /* global setTimeout */
-import '@endo/init/debug.js';
 import test from 'ava';
 
 // Use ambient authority only in test.before()
diff --git a/packages/governance/test/swingsetTests/committeeBinary/test-committee.js b/packages/governance/test/swingsetTests/committeeBinary/test-committee.js
index 2b8644641dc..c21b15ac88d 100644
--- a/packages/governance/test/swingsetTests/committeeBinary/test-committee.js
+++ b/packages/governance/test/swingsetTests/committeeBinary/test-committee.js
@@ -1,6 +1,5 @@
 /* eslint-disable ava/assertion-arguments -- the standard diff is unreadable */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import '@endo/init/debug.js';
 import test from 'ava';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
 import bundleSource from '@endo/bundle-source';
diff --git a/packages/governance/test/swingsetTests/contractGovernor/test-governor.js b/packages/governance/test/swingsetTests/contractGovernor/test-governor.js
index bae80c942c4..944f419e7f1 100644
--- a/packages/governance/test/swingsetTests/contractGovernor/test-governor.js
+++ b/packages/governance/test/swingsetTests/contractGovernor/test-governor.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 import path from 'path';
 
diff --git a/packages/inter-protocol/test/vaultFactory/test-storeUtils.js b/packages/inter-protocol/test/vaultFactory/test-storeUtils.js
index 13b697903a5..466b177b51a 100644
--- a/packages/inter-protocol/test/vaultFactory/test-storeUtils.js
+++ b/packages/inter-protocol/test/vaultFactory/test-storeUtils.js
@@ -1,5 +1,3 @@
-// Must be first to set up globals
-import '@endo/init/debug.js';
 // Consider ses-ava once https://github.com/endojs/endo/issues/1235 is resolved
 import test from 'ava';
 
diff --git a/packages/internal/test/test-netstring.js b/packages/internal/test/test-netstring.js
index 9a60259ebe2..7526c5b927d 100644
--- a/packages/internal/test/test-netstring.js
+++ b/packages/internal/test/test-netstring.js
@@ -1,5 +1,4 @@
 /* global Buffer */
-import '@endo/init/debug.js';
 import test from 'ava';
 
 import {
diff --git a/packages/internal/test/test-priority-senders.js b/packages/internal/test/test-priority-senders.js
index dfdbab71e06..50c4546f902 100644
--- a/packages/internal/test/test-priority-senders.js
+++ b/packages/internal/test/test-priority-senders.js
@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeFakeStorageKit } from '../src/storage-test-utils.js';
 import { HIGH_PRIORITY_SENDERS } from '../src/chain-storage-paths.js';
diff --git a/packages/internal/test/test-storage-test-utils.js b/packages/internal/test/test-storage-test-utils.js
index 38021821f9f..5eab748c657 100644
--- a/packages/internal/test/test-storage-test-utils.js
+++ b/packages/internal/test/test-storage-test-utils.js
@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 
diff --git a/packages/store/test/perf-patterns.js b/packages/store/test/perf-patterns.js
index 479a68fd084..c068c31e3b6 100644
--- a/packages/store/test/perf-patterns.js
+++ b/packages/store/test/perf-patterns.js
@@ -1,5 +1,3 @@
-import '@endo/init/debug.js';
-
 import { Far, makeTagged } from '@endo/marshal';
 import {
   makeCopyBag,
diff --git a/packages/store/test/prepare-test-env-ava.js b/packages/store/test/prepare-test-env-ava.js
index 914bdaa276c..391eb148b38 100644
--- a/packages/store/test/prepare-test-env-ava.js
+++ b/packages/store/test/prepare-test-env-ava.js
@@ -1,5 +1,3 @@
-import '@endo/init/debug.js';
-
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
diff --git a/packages/store/test/test-AtomicProvider.js b/packages/store/test/test-AtomicProvider.js
index cca033bbb36..d6a18bc12ed 100644
--- a/packages/store/test/test-AtomicProvider.js
+++ b/packages/store/test/test-AtomicProvider.js
@@ -1,5 +1,4 @@
 /* eslint-disable no-use-before-define */
-import '@endo/init/debug.js';
 
 import test from 'ava';
 import { Far } from '@endo/marshal';
diff --git a/packages/store/test/test-store.js b/packages/store/test/test-store.js
index 3f60bf440e2..b53f6196e31 100644
--- a/packages/store/test/test-store.js
+++ b/packages/store/test/test-store.js
@@ -1,5 +1,4 @@
 /* eslint-disable no-use-before-define */
-import '@endo/init/debug.js';
 
 import test from 'ava';
 
diff --git a/packages/swing-store/test/test-bundles.js b/packages/swing-store/test/test-bundles.js
index b181611a129..7c2003183e6 100644
--- a/packages/swing-store/test/test-bundles.js
+++ b/packages/swing-store/test/test-bundles.js
@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init/debug.js';
 import test from 'ava';
 import tmp from 'tmp';
 import { Buffer } from 'buffer';
diff --git a/packages/swing-store/test/test-deletion.js b/packages/swing-store/test/test-deletion.js
index 5a36bdf772d..a6bbe32b560 100644
--- a/packages/swing-store/test/test-deletion.js
+++ b/packages/swing-store/test/test-deletion.js
@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Buffer } from 'node:buffer';
 import { initSwingStore } from '../src/swingStore.js';
 
diff --git a/packages/swing-store/test/test-export.js b/packages/swing-store/test/test-export.js
index fae8e295c00..d93560ad91f 100644
--- a/packages/swing-store/test/test-export.js
+++ b/packages/swing-store/test/test-export.js
@@ -1,5 +1,3 @@
-import '@endo/init/debug.js';
-
 import test from 'ava';
 
 import { buffer } from '../src/util.js';
diff --git a/packages/swing-store/test/test-exportImport.js b/packages/swing-store/test/test-exportImport.js
index c3e83f4a4d1..a7aae84d621 100644
--- a/packages/swing-store/test/test-exportImport.js
+++ b/packages/swing-store/test/test-exportImport.js
@@ -1,6 +1,5 @@
 // @ts-check
 
-import '@endo/init/debug.js';
 import { Buffer } from 'node:buffer';
 
 import test from 'ava';
diff --git a/packages/swing-store/test/test-hasher.js b/packages/swing-store/test/test-hasher.js
index 5f05f5c0761..a6f851051f5 100644
--- a/packages/swing-store/test/test-hasher.js
+++ b/packages/swing-store/test/test-hasher.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 
 // eslint-disable-next-line import/order
diff --git a/packages/swing-store/test/test-import.js b/packages/swing-store/test/test-import.js
index 9893a30eced..620d9b35c01 100644
--- a/packages/swing-store/test/test-import.js
+++ b/packages/swing-store/test/test-import.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-import '@endo/init/debug.js';
-
 import path from 'path';
 import { createGunzip } from 'zlib';
 import { Readable } from 'stream';
diff --git a/packages/swing-store/test/test-repair-metadata.js b/packages/swing-store/test/test-repair-metadata.js
index 7b21d70734a..6fee2af4566 100644
--- a/packages/swing-store/test/test-repair-metadata.js
+++ b/packages/swing-store/test/test-repair-metadata.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-import '@endo/init/debug.js';
-
 import path from 'path';
 import test from 'ava';
 import sqlite3 from 'better-sqlite3';
diff --git a/packages/swing-store/test/test-snapstore.js b/packages/swing-store/test/test-snapstore.js
index 0000dceb840..2e725d18479 100644
--- a/packages/swing-store/test/test-snapstore.js
+++ b/packages/swing-store/test/test-snapstore.js
@@ -1,6 +1,5 @@
 // @ts-check
 
-import '@endo/init/debug.js';
 import { Buffer } from 'node:buffer';
 import zlib from 'zlib';
 import sqlite3 from 'better-sqlite3';
diff --git a/packages/swing-store/test/test-state.js b/packages/swing-store/test/test-state.js
index 02b7f73e8d7..1da6dc0ef74 100644
--- a/packages/swing-store/test/test-state.js
+++ b/packages/swing-store/test/test-state.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-import '@endo/init/debug.js';
-
 import tmp from 'tmp';
 import test from 'ava';
 
diff --git a/packages/swingset-liveslots/test/storeGC/test-lifecycle.js b/packages/swingset-liveslots/test/storeGC/test-lifecycle.js
index 3433af7e7bc..62bee16ccdb 100644
--- a/packages/swingset-liveslots/test/storeGC/test-lifecycle.js
+++ b/packages/swingset-liveslots/test/storeGC/test-lifecycle.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import {
   setupTestLiveslots,
diff --git a/packages/swingset-liveslots/test/storeGC/test-refcount-management.js b/packages/swingset-liveslots/test/storeGC/test-refcount-management.js
index c9a3772aef6..c5f88d56d61 100644
--- a/packages/swingset-liveslots/test/storeGC/test-refcount-management.js
+++ b/packages/swingset-liveslots/test/storeGC/test-refcount-management.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import {
   findSyscallsByType,
diff --git a/packages/swingset-liveslots/test/storeGC/test-scalar-store-kind.js b/packages/swingset-liveslots/test/storeGC/test-scalar-store-kind.js
index e6b427e15db..328948103e1 100644
--- a/packages/swingset-liveslots/test/storeGC/test-scalar-store-kind.js
+++ b/packages/swingset-liveslots/test/storeGC/test-scalar-store-kind.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { setupTestLiveslots } from '../liveslots-helpers.js';
 import { buildRootObject, mapRef } from '../gc-helpers.js';
diff --git a/packages/swingset-liveslots/test/storeGC/test-weak-key.js b/packages/swingset-liveslots/test/storeGC/test-weak-key.js
index e8f6ddd320c..d5001aa5057 100644
--- a/packages/swingset-liveslots/test/storeGC/test-weak-key.js
+++ b/packages/swingset-liveslots/test/storeGC/test-weak-key.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { setupTestLiveslots } from '../liveslots-helpers.js';
 import {
diff --git a/packages/swingset-liveslots/test/test-baggage.js b/packages/swingset-liveslots/test/test-baggage.js
index e33d068a740..be4b2013514 100644
--- a/packages/swingset-liveslots/test/test-baggage.js
+++ b/packages/swingset-liveslots/test/test-baggage.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { setupTestLiveslots } from './liveslots-helpers.js';
diff --git a/packages/swingset-liveslots/test/test-cache.js b/packages/swingset-liveslots/test/test-cache.js
index 0e8d0f0e9f5..1f98e52b18c 100644
--- a/packages/swingset-liveslots/test/test-cache.js
+++ b/packages/swingset-liveslots/test/test-cache.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeCache } from '../src/cache.js';
 
diff --git a/packages/swingset-liveslots/test/test-collection-schema-refcount.js b/packages/swingset-liveslots/test/test-collection-schema-refcount.js
index 03db7d350a4..7754e119ab9 100644
--- a/packages/swingset-liveslots/test/test-collection-schema-refcount.js
+++ b/packages/swingset-liveslots/test/test-collection-schema-refcount.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { makeLiveSlots } from '../src/liveslots.js';
diff --git a/packages/swingset-liveslots/test/test-collection-upgrade.js b/packages/swingset-liveslots/test/test-collection-upgrade.js
index a813d6ca2bb..e8f1719c7c4 100644
--- a/packages/swingset-liveslots/test/test-collection-upgrade.js
+++ b/packages/swingset-liveslots/test/test-collection-upgrade.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { M } from '@agoric/store';
diff --git a/packages/swingset-liveslots/test/test-collections.js b/packages/swingset-liveslots/test/test-collections.js
index 19c656177fe..2cc38122575 100644
--- a/packages/swingset-liveslots/test/test-collections.js
+++ b/packages/swingset-liveslots/test/test-collections.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { M } from '@agoric/store';
diff --git a/packages/swingset-liveslots/test/test-dropped-collection-weakrefs.js b/packages/swingset-liveslots/test/test-dropped-collection-weakrefs.js
index a562237ca07..466f5476399 100644
--- a/packages/swingset-liveslots/test/test-dropped-collection-weakrefs.js
+++ b/packages/swingset-liveslots/test/test-dropped-collection-weakrefs.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/marshal';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { kser } from './kmarshal.js';
diff --git a/packages/swingset-liveslots/test/test-durabilityChecks.js b/packages/swingset-liveslots/test/test-durabilityChecks.js
index 3004d99dcb7..7b3a144d963 100644
--- a/packages/swingset-liveslots/test/test-durabilityChecks.js
+++ b/packages/swingset-liveslots/test/test-durabilityChecks.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { makeFakeVirtualStuff } from '../tools/fakeVirtualSupport.js';
diff --git a/packages/swingset-liveslots/test/test-facetiousness.js b/packages/swingset-liveslots/test/test-facetiousness.js
index d0613f395fa..36de5230827 100644
--- a/packages/swingset-liveslots/test/test-facetiousness.js
+++ b/packages/swingset-liveslots/test/test-facetiousness.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import {
   assessFacetiousness,
diff --git a/packages/swingset-liveslots/test/test-gc-sensitivity.js b/packages/swingset-liveslots/test/test-gc-sensitivity.js
index 2564fb56b6b..86215af4d2e 100644
--- a/packages/swingset-liveslots/test/test-gc-sensitivity.js
+++ b/packages/swingset-liveslots/test/test-gc-sensitivity.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/marshal';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeLiveSlots } from '../src/liveslots.js';
diff --git a/packages/swingset-liveslots/test/test-handled-promises.js b/packages/swingset-liveslots/test/test-handled-promises.js
index d264c8d3334..fc14cfae634 100644
--- a/packages/swingset-liveslots/test/test-handled-promises.js
+++ b/packages/swingset-liveslots/test/test-handled-promises.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { Fail } from '@agoric/assert';
diff --git a/packages/swingset-liveslots/test/test-initial-vrefs.js b/packages/swingset-liveslots/test/test-initial-vrefs.js
index 1de3224501b..65916a3d06b 100644
--- a/packages/swingset-liveslots/test/test-initial-vrefs.js
+++ b/packages/swingset-liveslots/test/test-initial-vrefs.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/far';
 import { M } from '@agoric/store';
diff --git a/packages/swingset-liveslots/test/test-liveslots-mock-gc.js b/packages/swingset-liveslots/test/test-liveslots-mock-gc.js
index d5698d0800b..ad73d7d4dfd 100644
--- a/packages/swingset-liveslots/test/test-liveslots-mock-gc.js
+++ b/packages/swingset-liveslots/test/test-liveslots-mock-gc.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { makeLiveSlots } from '../src/liveslots.js';
diff --git a/packages/swingset-liveslots/test/test-liveslots-real-gc.js b/packages/swingset-liveslots/test/test-liveslots-real-gc.js
index 21182c58bc5..0bb1c92389e 100644
--- a/packages/swingset-liveslots/test/test-liveslots-real-gc.js
+++ b/packages/swingset-liveslots/test/test-liveslots-real-gc.js
@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* global WeakRef */
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
diff --git a/packages/swingset-liveslots/test/test-liveslots.js b/packages/swingset-liveslots/test/test-liveslots.js
index eaff34b36d6..9bcb2fa9ae8 100644
--- a/packages/swingset-liveslots/test/test-liveslots.js
+++ b/packages/swingset-liveslots/test/test-liveslots.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
diff --git a/packages/swingset-liveslots/test/test-vo-test-harness.js b/packages/swingset-liveslots/test/test-vo-test-harness.js
index 9e8e17abeee..d8341c7405c 100644
--- a/packages/swingset-liveslots/test/test-vo-test-harness.js
+++ b/packages/swingset-liveslots/test/test-vo-test-harness.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 import { runVOTest } from '../tools/vo-test-harness.js';
 
 async function voTestTest(t, mode) {
diff --git a/packages/swingset-liveslots/test/test-vpid-liveslots.js b/packages/swingset-liveslots/test/test-vpid-liveslots.js
index 6e7f0872c3a..2903c6bded5 100644
--- a/packages/swingset-liveslots/test/test-vpid-liveslots.js
+++ b/packages/swingset-liveslots/test/test-vpid-liveslots.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { E } from '@endo/eventual-send';
 import { makePromiseKit } from '@endo/promise-kit';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-cease-recognition.js b/packages/swingset-liveslots/test/virtual-objects/test-cease-recognition.js
index 31646fc913e..3fcf7adbe1f 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-cease-recognition.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-cease-recognition.js
@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* global FinalizationRegistry WeakRef */
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { buildSyscall } from '../liveslots-helpers.js';
 import { makeVirtualReferenceManager } from '../../src/virtualReferences.js';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-cross-facet.js b/packages/swingset-liveslots/test/virtual-objects/test-cross-facet.js
index 9a087ae92b8..e943b46ae2c 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-cross-facet.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-cross-facet.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeFakeVirtualObjectManager } from '../../tools/fakeVirtualSupport.js';
 
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-empty-data.js b/packages/swingset-liveslots/test/virtual-objects/test-empty-data.js
index 1998b90267f..3ee6826d85b 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-empty-data.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-empty-data.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeFakeVirtualObjectManager } from '../../tools/fakeVirtualSupport.js';
 
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-facets.js b/packages/swingset-liveslots/test/virtual-objects/test-facets.js
index fdc43367a76..b7a6a8d2b0c 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-facets.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-facets.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeFakeVirtualObjectManager } from '../../tools/fakeVirtualSupport.js';
 
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-kind-changes.js b/packages/swingset-liveslots/test/virtual-objects/test-kind-changes.js
index c5b9e2c2f95..82b01ac24f1 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-kind-changes.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-kind-changes.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/marshal';
 import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
 import { makeLiveSlots } from '../../src/liveslots.js';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-reachable-vrefs.js b/packages/swingset-liveslots/test/virtual-objects/test-reachable-vrefs.js
index 76a7f5de736..5a1a00caa68 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-reachable-vrefs.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-reachable-vrefs.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Remotable } from '@endo/marshal';
 import { initEmpty } from '@agoric/store';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-rep-tostring.js b/packages/swingset-liveslots/test/virtual-objects/test-rep-tostring.js
index 8c126c6706e..e75ccf2ee6b 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-rep-tostring.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-rep-tostring.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 // this sets process.env.DEBUG = 'label-instances'
 import './set-debug-label-instances.js';
 
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-retain-remotable.js b/packages/swingset-liveslots/test/virtual-objects/test-retain-remotable.js
index b3874491e20..3bc3c9d2896 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-retain-remotable.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-retain-remotable.js
@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* global WeakRef */
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { initEmpty } from '@agoric/store';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-state-shape.js b/packages/swingset-liveslots/test/virtual-objects/test-state-shape.js
index 274aa8932b6..c2891cbda8e 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-state-shape.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-state-shape.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { M } from '@agoric/store';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectGC.js b/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectGC.js
index 5f8adb92de6..14f9b3ec592 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectGC.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectGC.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import {
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectManager.js b/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectManager.js
index 02e2491a0bc..86519f4fad1 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectManager.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-virtualObjectManager.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import {
   makeFakeVirtualObjectManager,
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-vo-real-gc.js b/packages/swingset-liveslots/test/virtual-objects/test-vo-real-gc.js
index 48254072660..e4eadb938a2 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-vo-real-gc.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-vo-real-gc.js
@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* global WeakRef */
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { kser, kunser } from '../kmarshal.js';
diff --git a/packages/swingset-liveslots/test/virtual-objects/test-weakcollections-vref-handling.js b/packages/swingset-liveslots/test/virtual-objects/test-weakcollections-vref-handling.js
index 170a43802c3..112def7472a 100644
--- a/packages/swingset-liveslots/test/virtual-objects/test-weakcollections-vref-handling.js
+++ b/packages/swingset-liveslots/test/virtual-objects/test-weakcollections-vref-handling.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeFakeVirtualObjectManager } from '../../tools/fakeVirtualSupport.js';
 
diff --git a/packages/swingset-xsnap-supervisor/test/test-bundle.js b/packages/swingset-xsnap-supervisor/test/test-bundle.js
index 6a1b2fc42a0..8eb07282a39 100644
--- a/packages/swingset-xsnap-supervisor/test/test-bundle.js
+++ b/packages/swingset-xsnap-supervisor/test/test-bundle.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import fs from 'fs';
 import crypto from 'crypto';
diff --git a/packages/vat-data/test/absent.test.js b/packages/vat-data/test/absent.test.js
index 0cfac1f32a6..c5580a9590a 100644
--- a/packages/vat-data/test/absent.test.js
+++ b/packages/vat-data/test/absent.test.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 
 /* global globalThis */
diff --git a/packages/vat-data/test/present.test.js b/packages/vat-data/test/present.test.js
index 8b85225cece..a75fefb336f 100644
--- a/packages/vat-data/test/present.test.js
+++ b/packages/vat-data/test/present.test.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 
 const mockDefineKind = /** @type {any} */ (harden({}));
diff --git a/packages/vats/test/test-dump.js b/packages/vats/test/test-dump.js
index e0e31f21da9..1424f6ca19b 100644
--- a/packages/vats/test/test-dump.js
+++ b/packages/vats/test/test-dump.js
@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init/debug.js';
 import test from 'ava';
 
 import { dump } from '../src/repl.js';
diff --git a/packages/vats/test/test-repl.js b/packages/vats/test/test-repl.js
index 8cece741517..bf7f0224d0d 100644
--- a/packages/vats/test/test-repl.js
+++ b/packages/vats/test/test-repl.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import { getReplHandler } from '../src/repl.js';
 
diff --git a/packages/xsnap-lockdown/test/test-bundle.js b/packages/xsnap-lockdown/test/test-bundle.js
index a8fbfb85fa3..6dd3b4f9c01 100644
--- a/packages/xsnap-lockdown/test/test-bundle.js
+++ b/packages/xsnap-lockdown/test/test-bundle.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import fs from 'fs';
 import crypto from 'crypto';
diff --git a/packages/xsnap-lockdown/test/test-inspect.js b/packages/xsnap-lockdown/test/test-inspect.js
index 70790b4353a..8693ba62dc6 100644
--- a/packages/xsnap-lockdown/test/test-inspect.js
+++ b/packages/xsnap-lockdown/test/test-inspect.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 import unconfinedInspect from '../lib/object-inspect.js';
 
 const testCases = [
diff --git a/packages/xsnap/test/test-boot-lockdown.js b/packages/xsnap/test/test-boot-lockdown.js
index 3b71f2f4a0d..189afd7458c 100644
--- a/packages/xsnap/test/test-boot-lockdown.js
+++ b/packages/xsnap/test/test-boot-lockdown.js
@@ -1,7 +1,5 @@
 import test from 'ava';
 
-import '@endo/init/debug.js';
-
 import * as proc from 'child_process';
 import * as os from 'os';
 import * as fs from 'fs';
diff --git a/packages/xsnap/test/test-err-stack.js b/packages/xsnap/test/test-err-stack.js
index 89aae77adb4..8e4c3cec599 100644
--- a/packages/xsnap/test/test-err-stack.js
+++ b/packages/xsnap/test/test-err-stack.js
@@ -1,7 +1,5 @@
 // JavaScript correctness tests
 
-import '@endo/init/debug.js';
-
 import test from 'ava';
 import * as proc from 'child_process';
 import fs from 'fs';
diff --git a/packages/xsnap/test/test-gc.js b/packages/xsnap/test/test-gc.js
index aba27d92075..92a3f1fa382 100644
--- a/packages/xsnap/test/test-gc.js
+++ b/packages/xsnap/test/test-gc.js
@@ -1,5 +1,4 @@
 /* global FinalizationRegistry WeakRef */
-import '@endo/init/debug.js';
 
 import test from 'ava';
 
diff --git a/packages/xsnap/test/test-inspect.js b/packages/xsnap/test/test-inspect.js
index 950816ca54b..b895f2a3333 100644
--- a/packages/xsnap/test/test-inspect.js
+++ b/packages/xsnap/test/test-inspect.js
@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import * as proc from 'child_process';
 import fs from 'fs';
diff --git a/packages/xsnap/test/test-replay.js b/packages/xsnap/test/test-replay.js
index ba4e4a64677..a47040b499b 100644
--- a/packages/xsnap/test/test-replay.js
+++ b/packages/xsnap/test/test-replay.js
@@ -1,7 +1,5 @@
 /* global Buffer */
 
-import '@endo/init/debug.js';
-
 import test from 'ava';
 
 import * as proc from 'child_process';
diff --git a/packages/xsnap/test/test-xs-js.js b/packages/xsnap/test/test-xs-js.js
index e43841ffcfa..418ddf28ecf 100644
--- a/packages/xsnap/test/test-xs-js.js
+++ b/packages/xsnap/test/test-xs-js.js
@@ -1,7 +1,5 @@
 // JavaScript correctness tests
 
-import '@endo/init/debug.js';
-
 import test from 'ava';
 import * as proc from 'child_process';
 import fs from 'fs';
diff --git a/packages/xsnap/test/test-xs-limits.js b/packages/xsnap/test/test-xs-limits.js
index ce5202a17de..58aa10522ba 100644
--- a/packages/xsnap/test/test-xs-limits.js
+++ b/packages/xsnap/test/test-xs-limits.js
@@ -1,7 +1,5 @@
 // XS resource exhaustion tests
 
-import '@endo/init/debug.js';
-
 import test from 'ava';
 
 import * as proc from 'child_process';
diff --git a/packages/xsnap/test/test-xs-perf.js b/packages/xsnap/test/test-xs-perf.js
index aeeb291d1bc..2d731acb617 100644
--- a/packages/xsnap/test/test-xs-perf.js
+++ b/packages/xsnap/test/test-xs-perf.js
@@ -1,5 +1,4 @@
 /* global performance */
-import '@endo/init/debug.js';
 
 import test from 'ava';
 
diff --git a/packages/xsnap/test/test-xsnap.js b/packages/xsnap/test/test-xsnap.js
index 2641aaf93a6..3b58edbf1b3 100644
--- a/packages/xsnap/test/test-xsnap.js
+++ b/packages/xsnap/test/test-xsnap.js
@@ -1,5 +1,4 @@
 /* global setTimeout, FinalizationRegistry, setImmediate, process */
-import '@endo/init/debug.js';
 
 import test from 'ava';
 
diff --git a/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js b/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js
index c1a8be77f46..de6858b7308 100644
--- a/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js
+++ b/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 
-import '@endo/init/debug.js';
 import test from 'ava';
 import path from 'path';
 
diff --git a/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js b/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js
index 0bba576f619..9de18e88c8c 100644
--- a/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js
+++ b/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import anyTest from 'ava';
 import path from 'path';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
diff --git a/packages/zoe/test/swingsetTests/offerArgs/test-offerArgs.js b/packages/zoe/test/swingsetTests/offerArgs/test-offerArgs.js
index fe219000dd1..12445d8d181 100644
--- a/packages/zoe/test/swingsetTests/offerArgs/test-offerArgs.js
+++ b/packages/zoe/test/swingsetTests/offerArgs/test-offerArgs.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import anyTest from 'ava';
 import path from 'path';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
diff --git a/packages/zoe/test/swingsetTests/privateArgs/test-privateArgs.js b/packages/zoe/test/swingsetTests/privateArgs/test-privateArgs.js
index 354c651654f..d82ce759b25 100644
--- a/packages/zoe/test/swingsetTests/privateArgs/test-privateArgs.js
+++ b/packages/zoe/test/swingsetTests/privateArgs/test-privateArgs.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import anyTest from 'ava';
 import path from 'path';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
diff --git a/packages/zoe/test/swingsetTests/runMint/test-runMint.js b/packages/zoe/test/swingsetTests/runMint/test-runMint.js
index 5d19a0a4130..c870fe5f195 100644
--- a/packages/zoe/test/swingsetTests/runMint/test-runMint.js
+++ b/packages/zoe/test/swingsetTests/runMint/test-runMint.js
@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import anyTest from 'ava';
 import path from 'path';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
diff --git a/packages/zoe/test/swingsetTests/zoe/test-zoe.js b/packages/zoe/test/swingsetTests/zoe/test-zoe.js
index ba597d38522..dfc6161383c 100644
--- a/packages/zoe/test/swingsetTests/zoe/test-zoe.js
+++ b/packages/zoe/test/swingsetTests/zoe/test-zoe.js
@@ -1,5 +1,4 @@
 // @ts-nocheck
-import '@endo/init/debug.js';
 import test from 'ava';
 import path from 'path';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';

From 400f29f48196a9a9f5d7c3b4430019369313485e Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 16 Aug 2023 12:07:09 -0400
Subject: [PATCH 4/6] test: remove endo/init

---
 packages/assert/test/test-assert.js                            | 2 --
 packages/cosmic-swingset/test/test-export-storage.js           | 1 -
 .../test/unitTests/test-assertOfferResult.js                   | 1 -
 packages/internal/test/test-callback.js                        | 1 -
 packages/internal/test/test-upgrade-api.js                     | 1 -
 packages/internal/test/test-utils.js                           | 1 -
 packages/notifier/test/prepare-test-env-ava.js                 | 2 --
 packages/telemetry/test/prepare-test-env-ava.js                | 2 --
 packages/time/test/test-timeMath.js                            | 3 ---
 packages/vats/test/test-tokens.js                              | 1 -
 10 files changed, 15 deletions(-)

diff --git a/packages/assert/test/test-assert.js b/packages/assert/test/test-assert.js
index cd1d2bacfad..9e2fa4b36e1 100644
--- a/packages/assert/test/test-assert.js
+++ b/packages/assert/test/test-assert.js
@@ -1,5 +1,3 @@
-import '@endo/init';
-// eslint-disable-next-line import/no-unresolved -- lint error not worth solving; test passes
 import test from 'ava';
 
 import { NonNullish, Fail } from '../src/assert.js';
diff --git a/packages/cosmic-swingset/test/test-export-storage.js b/packages/cosmic-swingset/test/test-export-storage.js
index 07d6b90f3a6..e243a8432d2 100644
--- a/packages/cosmic-swingset/test/test-export-storage.js
+++ b/packages/cosmic-swingset/test/test-export-storage.js
@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 import { exportStorage } from '../src/export-storage.js';
 
diff --git a/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js b/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js
index 4267df8fd39..2f2b8b071ae 100644
--- a/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js
+++ b/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js
@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init';
 
 import { assertOfferResult } from '../../src/assertOfferResult.js';
 
diff --git a/packages/internal/test/test-callback.js b/packages/internal/test/test-callback.js
index 8aff0083b60..2b16494de54 100644
--- a/packages/internal/test/test-callback.js
+++ b/packages/internal/test/test-callback.js
@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 
 import { Far } from '@endo/far';
diff --git a/packages/internal/test/test-upgrade-api.js b/packages/internal/test/test-upgrade-api.js
index f657ebd9862..5ffc38f9b29 100644
--- a/packages/internal/test/test-upgrade-api.js
+++ b/packages/internal/test/test-upgrade-api.js
@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 import {
   makeUpgradeDisconnection,
diff --git a/packages/internal/test/test-utils.js b/packages/internal/test/test-utils.js
index 4e64c0e1632..e81b6ae7e4d 100644
--- a/packages/internal/test/test-utils.js
+++ b/packages/internal/test/test-utils.js
@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init';
 
 import { Far } from '@endo/far';
 import {
diff --git a/packages/notifier/test/prepare-test-env-ava.js b/packages/notifier/test/prepare-test-env-ava.js
index 184d8f46898..f4475cf9d6f 100644
--- a/packages/notifier/test/prepare-test-env-ava.js
+++ b/packages/notifier/test/prepare-test-env-ava.js
@@ -1,5 +1,3 @@
-import '@endo/init';
-
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
diff --git a/packages/telemetry/test/prepare-test-env-ava.js b/packages/telemetry/test/prepare-test-env-ava.js
index 3350af1a73a..12d026b2408 100644
--- a/packages/telemetry/test/prepare-test-env-ava.js
+++ b/packages/telemetry/test/prepare-test-env-ava.js
@@ -1,5 +1,3 @@
-import '@endo/init';
-
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
diff --git a/packages/time/test/test-timeMath.js b/packages/time/test/test-timeMath.js
index 2befd6041a9..14fc4a12f3e 100644
--- a/packages/time/test/test-timeMath.js
+++ b/packages/time/test/test-timeMath.js
@@ -1,6 +1,3 @@
-import '@endo/init';
-
-// eslint-disable-next-line import/order
 import test from 'ava';
 import { Far } from '@endo/far';
 import { TimeMath } from '../src/timeMath.js';
diff --git a/packages/vats/test/test-tokens.js b/packages/vats/test/test-tokens.js
index 542e522966e..bc0ff3a1dcf 100644
--- a/packages/vats/test/test-tokens.js
+++ b/packages/vats/test/test-tokens.js
@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 
 import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';

From 4aee92a9f9fd5ab929bc276ef246db147e562ed5 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 16 Aug 2023 12:46:27 -0400
Subject: [PATCH 5/6] test: remove endo/init/pre-bundle-source

done by the prepare-test-env-ava import
---
 packages/SwingSet/test/vat-warehouse/test-warehouse.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SwingSet/test/vat-warehouse/test-warehouse.js b/packages/SwingSet/test/vat-warehouse/test-warehouse.js
index b7d57d4e5e7..b14a456e753 100644
--- a/packages/SwingSet/test/vat-warehouse/test-warehouse.js
+++ b/packages/SwingSet/test/vat-warehouse/test-warehouse.js
@@ -1,9 +1,7 @@
 // @ts-check
 
-import '@endo/init/pre-bundle-source.js';
-
-// eslint-disable-next-line import/order
 import { test } from '../../tools/prepare-test-env-ava.js';
+
 import { buildVatController } from '../../src/index.js';
 import { makeLRU } from '../../src/kernel/vat-warehouse.js';
 

From 84e49cc2879a560fff58ec335cf5e059d7c9d9d4 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 16 Aug 2023 15:18:12 -0400
Subject: [PATCH 6/6] chore(types): clean up ses-ava comments

---
 packages/SwingSet/tools/prepare-test-env-ava.js              | 3 ---
 packages/inter-protocol/test/vaultFactory/test-storeUtils.js | 1 -
 packages/notifier/test/prepare-test-env-ava.js               | 2 --
 3 files changed, 6 deletions(-)

diff --git a/packages/SwingSet/tools/prepare-test-env-ava.js b/packages/SwingSet/tools/prepare-test-env-ava.js
index 585e5738a51..eadbce67c94 100644
--- a/packages/SwingSet/tools/prepare-test-env-ava.js
+++ b/packages/SwingSet/tools/prepare-test-env-ava.js
@@ -13,9 +13,6 @@ import '@endo/ses-ava/exported.js';
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
-/** @type {typeof rawTest} */
-// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
-// @ts-ignore XXX https://github.com/endojs/endo/issues/1235
 export const test = wrapTest(rawTest);
 
 // Does not import from a module because we're testing the global env
diff --git a/packages/inter-protocol/test/vaultFactory/test-storeUtils.js b/packages/inter-protocol/test/vaultFactory/test-storeUtils.js
index 466b177b51a..16e7762340c 100644
--- a/packages/inter-protocol/test/vaultFactory/test-storeUtils.js
+++ b/packages/inter-protocol/test/vaultFactory/test-storeUtils.js
@@ -1,4 +1,3 @@
-// Consider ses-ava once https://github.com/endojs/endo/issues/1235 is resolved
 import test from 'ava';
 
 import { AmountMath } from '@agoric/ertp';
diff --git a/packages/notifier/test/prepare-test-env-ava.js b/packages/notifier/test/prepare-test-env-ava.js
index f4475cf9d6f..12d026b2408 100644
--- a/packages/notifier/test/prepare-test-env-ava.js
+++ b/packages/notifier/test/prepare-test-env-ava.js
@@ -1,6 +1,4 @@
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
-// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
-// @ts-ignore -- https://github.com/endojs/endo/issues/1235
 export const test = wrapTest(rawTest);