From bfa11c7c4fbb2f082edca9e191f1b841dc1f1191 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 13 Nov 2026 18:29:21 -0800
Subject: [PATCH] Align store test fixtures and await pairing replacement

---
 src/cli/runtime/cli-lifecycle-handlers.test.ts                  | 2 +-
 src/cli/runtime/client-environment-usage.test.ts                | 2 +-
 src/cli/runtime/client-recovery.test.ts                         | 2 +-
 src/cli/runtime/client.test.ts                                  | 2 +-
 src/cli/runtime/envelope-schema.test.ts                         | 2 +-
 src/cli/runtime/environment-pairing-exchange.test.ts            | 2 +-
 src/cli/runtime/environments.test.ts                            | 2 +-
 src/cli/runtime/launch-serve-preflight.test.ts                  | 2 +-
 src/cli/runtime/launch-serve-replaced-app-restart.test.ts       | 2 +-
 src/cli/runtime/launch.test.ts                                  | 2 +-
 src/cli/runtime/offline-admission-commands.test.ts              | 2 +-
 src/cli/runtime/profile-state-recovery-launch.test.ts           | 2 +-
 src/cli/runtime/recipe-vm-wake-gate.test.ts                     | 2 +-
 src/cli/runtime/runtime-listener-probe.test.ts                  | 2 +-
 src/cli/runtime/runtime-source-fence.test.ts                    | 2 +-
 src/cli/runtime/serve-appimage-update.test.ts                   | 2 +-
 src/cli/runtime/serve-bundle-park.test.ts                       | 2 +-
 src/cli/runtime/serve-electron-preflight.test.ts                | 2 +-
 src/cli/runtime/serve-pairing-redaction.test.ts                 | 2 +-
 src/cli/runtime/serve-pid1-init-reaper.test.ts                  | 2 +-
 src/cli/runtime/serve-signal-exit-diagnostic.test.ts            | 2 +-
 src/cli/runtime/serve-speech-recognizer.test.ts                 | 2 +-
 src/cli/runtime/serve-supervised-service.test.ts                | 2 +-
 src/cli/runtime/serve-supervisor-policy.test.ts                 | 2 +-
 src/cli/runtime/serve-supervisor-relocation.test.ts             | 2 +-
 src/cli/runtime/serve-update-supervisor-gate.test.ts            | 2 +-
 src/cli/runtime/status-caller.test.ts                           | 2 +-
 src/cli/runtime/status.test.ts                                  | 2 +-
 src/cli/runtime/transport-framing.test.ts                       | 2 +-
 src/cli/runtime/transport.test.ts                               | 2 +-
 src/cli/runtime/types.test.ts                                   | 2 +-
 src/main/ephemeral-vm/pending-vm-checkouts.test.ts              | 2 +-
 src/main/ephemeral-vm/recipe-runner.test.ts                     | 2 +-
 src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts           | 2 +-
 src/main/ephemeral-vm/runtime-resume-pairing.test.ts            | 2 +-
 src/main/ephemeral-vm/runtime-service.test.ts                   | 2 +-
 src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts               | 2 +-
 src/main/ephemeral-vm/workspace-removal.test.ts                 | 2 +-
 .../ephemeral-vm/workspace-resume-paired-lost-contact.test.ts   | 2 +-
 src/main/ephemeral-vm/workspace-resume-user-disconnect.test.ts  | 2 +-
 src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts       | 2 +-
 .../runtime-environment-browser-client-host-handler.test.ts     | 2 +-
 .../catalog/runtime-environment-host-key.test.ts                | 2 +-
 .../catalog/runtime-environment-preference.test.ts              | 2 +-
 .../catalog/runtime-environment-session-reconcile.test.ts       | 2 +-
 .../connections/runtime-environment-capability-evidence.test.ts | 2 +-
 .../connections/runtime-environment-request-connections.test.ts | 2 +-
 .../managed-orcad/runtime-environment-recipe-vm-wake.test.ts    | 2 +-
 .../pairing/runtime-environment-managed-pairing-refusal.test.ts | 2 +-
 .../pairing/runtime-environments-pairing.test.ts                | 2 +-
 .../pairing/runtime-environments-repair.test.ts                 | 2 +-
 .../requests/runtime-environment-federated-read-routing.test.ts | 2 +-
 .../requests/runtime-environment-request-preparation.test.ts    | 2 +-
 .../status/runtime-environment-contact-loss.test.ts             | 2 +-
 .../status/runtime-environment-status-connection.test.ts        | 2 +-
 .../status/runtime-environment-status-retirement.test.ts        | 2 +-
 .../runtime-environments-subscription-lifecycle.test.ts         | 2 +-
 src/main/ipc/ssh/ssh-ipc-test-harness.ts                        | 2 +-
 src/main/ipc/wsl/wsl-move-host-connect.test.ts                  | 2 +-
 .../lifecycle/orcad-managed-tunnel-local-port.test.ts           | 2 +-
 src/main/managed-server/lifecycle/orcad-runtime-forget.test.ts  | 2 +-
 .../managed-server/lifecycle/orcad-runtime-maintenance.test.ts  | 2 +-
 .../migration/cutover/orcad-migration-delta-move.test.ts        | 2 +-
 .../migration/cutover/orcad-migration-delta-snapshot.test.ts    | 2 +-
 .../migration/cutover/orcad-unreachable-setup-release.test.ts   | 2 +-
 .../migration/linking/orcad-migration-repository-link.test.ts   | 2 +-
 src/main/runtime/rpc/server/runtime-metadata.test.ts            | 2 +-
 .../workspace-rows/paired-server-rows-producer.test.ts          | 2 +-
 src/main/ssh/runtime-access/runtime-ssh-access.test.ts          | 2 +-
 src/main/wsl/host-lifecycle/wsl-host-automation-enable.test.ts  | 2 +-
 src/main/wsl/host-lifecycle/wsl-host-distro-list.test.ts        | 2 +-
 src/main/wsl/host-lifecycle/wsl-host-kept-for-peers.test.ts     | 2 +-
 src/main/wsl/host-lifecycle/wsl-host-pending-removal.test.ts    | 2 +-
 src/main/wsl/host-lifecycle/wsl-host-server-stop.test.ts        | 2 +-
 .../wsl/host-lifecycle/wsl-host-service-user-actions.test.ts    | 2 +-
 src/main/wsl/host-lifecycle/wsl-host-service.test.ts            | 2 +-
 .../wsl/host-lifecycle/wsl-host-uninstall-server-stop.test.ts   | 2 +-
 .../wsl/host-lifecycle/wsl-hosts-policy-live-update.test.ts     | 2 +-
 src/main/wsl/host-lifecycle/wsl-orphan-holder-release.test.ts   | 2 +-
 .../runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts | 2 +-
 .../store/slices/ephemeral-vm/ephemeral-vm-lifecycle.test.ts    | 2 +-
 ...test-support.ts => environment-store-worker-test-fixture.ts} | 0
 .../host-store/runtime-environment-store-worker.test.ts         | 2 +-
 tests/e2e/helpers/nested-runtime-same-id-pairing.ts             | 2 +-
 84 files changed, 83 insertions(+), 83 deletions(-)
 rename src/shared/remote-runtime/host-store/{environment-store-worker.test-support.ts => environment-store-worker-test-fixture.ts} (100%)

diff --git a/src/cli/runtime/cli-lifecycle-handlers.test.ts b/src/cli/runtime/cli-lifecycle-handlers.test.ts
index fbd815119fe..f433d18c7e9 100644
--- a/src/cli/runtime/cli-lifecycle-handlers.test.ts
+++ b/src/cli/runtime/cli-lifecycle-handlers.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { spawnMock, reclaimStaleLockMock, printReclaimResultMock } = vi.hoisted(() => ({
diff --git a/src/cli/runtime/client-environment-usage.test.ts b/src/cli/runtime/client-environment-usage.test.ts
index 555fba21169..e266dc3d456 100644
--- a/src/cli/runtime/client-environment-usage.test.ts
+++ b/src/cli/runtime/client-environment-usage.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import type * as nodeFs from 'node:fs'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/client-recovery.test.ts b/src/cli/runtime/client-recovery.test.ts
index 0f7cdc04f48..f3ffbb31b6c 100644
--- a/src/cli/runtime/client-recovery.test.ts
+++ b/src/cli/runtime/client-recovery.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { createServer, type Server } from 'node:net'
 import { mkdtempSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/client.test.ts b/src/cli/runtime/client.test.ts
index 03efff4412c..47160c73eec 100644
--- a/src/cli/runtime/client.test.ts
+++ b/src/cli/runtime/client.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/cli/runtime/envelope-schema.test.ts b/src/cli/runtime/envelope-schema.test.ts
index 210850d8c92..2fd6b7d83c4 100644
--- a/src/cli/runtime/envelope-schema.test.ts
+++ b/src/cli/runtime/envelope-schema.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it } from 'vitest'
 import { RuntimeRpcEnvelopeSchema } from './envelope-schema'
 
diff --git a/src/cli/runtime/environment-pairing-exchange.test.ts b/src/cli/runtime/environment-pairing-exchange.test.ts
index e40834da618..1918daa4cde 100644
--- a/src/cli/runtime/environment-pairing-exchange.test.ts
+++ b/src/cli/runtime/environment-pairing-exchange.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it, vi } from 'vitest'
 import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing'
 import { RemoteRuntimeClientError } from '../../shared/remote-runtime/remote-runtime-client-error'
diff --git a/src/cli/runtime/environments.test.ts b/src/cli/runtime/environments.test.ts
index 18403ca5130..c1699b19255 100644
--- a/src/cli/runtime/environments.test.ts
+++ b/src/cli/runtime/environments.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync, statSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/cli/runtime/launch-serve-preflight.test.ts b/src/cli/runtime/launch-serve-preflight.test.ts
index 46505450bb8..f7593d7cc67 100644
--- a/src/cli/runtime/launch-serve-preflight.test.ts
+++ b/src/cli/runtime/launch-serve-preflight.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { EventEmitter } from 'node:events'
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { createServer, type Socket } from 'node:net'
diff --git a/src/cli/runtime/launch-serve-replaced-app-restart.test.ts b/src/cli/runtime/launch-serve-replaced-app-restart.test.ts
index 67a0af715c9..a160b15e0a5 100644
--- a/src/cli/runtime/launch-serve-replaced-app-restart.test.ts
+++ b/src/cli/runtime/launch-serve-replaced-app-restart.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { EventEmitter } from 'node:events'
 import { chmod, mkdir, mkdtemp, rename, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/launch.test.ts b/src/cli/runtime/launch.test.ts
index de12784cf4e..283f9c00ae7 100644
--- a/src/cli/runtime/launch.test.ts
+++ b/src/cli/runtime/launch.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { EventEmitter } from 'node:events'
 import { rm } from 'node:fs/promises'
 import 'node:os'
diff --git a/src/cli/runtime/offline-admission-commands.test.ts b/src/cli/runtime/offline-admission-commands.test.ts
index 577d57d3b1c..b7cbc4aa051 100644
--- a/src/cli/runtime/offline-admission-commands.test.ts
+++ b/src/cli/runtime/offline-admission-commands.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { createServer, type Socket } from 'node:net'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/profile-state-recovery-launch.test.ts b/src/cli/runtime/profile-state-recovery-launch.test.ts
index 5bb66f1ead9..e67a72e15e4 100644
--- a/src/cli/runtime/profile-state-recovery-launch.test.ts
+++ b/src/cli/runtime/profile-state-recovery-launch.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { realpathSync } from 'node:fs'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
diff --git a/src/cli/runtime/recipe-vm-wake-gate.test.ts b/src/cli/runtime/recipe-vm-wake-gate.test.ts
index 2f91794cf6c..d50e15c065a 100644
--- a/src/cli/runtime/recipe-vm-wake-gate.test.ts
+++ b/src/cli/runtime/recipe-vm-wake-gate.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 // #36923: the CLI reaches a recipe VM's server directly, so it asks the desktop that owns the
 // VM to wake it, and only for a command that opens the workspace.
 import { mkdtempSync, rmSync } from 'node:fs'
diff --git a/src/cli/runtime/runtime-listener-probe.test.ts b/src/cli/runtime/runtime-listener-probe.test.ts
index 57c9c6581a4..a1f48594f1e 100644
--- a/src/cli/runtime/runtime-listener-probe.test.ts
+++ b/src/cli/runtime/runtime-listener-probe.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { spawn } from 'node:child_process'
 import { chmodSync, mkdirSync, mkdtempSync } from 'node:fs'
 import { createServer, type Server, type Socket } from 'node:net'
diff --git a/src/cli/runtime/runtime-source-fence.test.ts b/src/cli/runtime/runtime-source-fence.test.ts
index 5252e886c66..002e0e9d580 100644
--- a/src/cli/runtime/runtime-source-fence.test.ts
+++ b/src/cli/runtime/runtime-source-fence.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { createServer, type Server } from 'node:net'
 import { randomUUID } from 'node:crypto'
 import { mkdtempSync, writeFileSync } from 'node:fs'
diff --git a/src/cli/runtime/serve-appimage-update.test.ts b/src/cli/runtime/serve-appimage-update.test.ts
index 6675ef08c49..77f158aadc4 100644
--- a/src/cli/runtime/serve-appimage-update.test.ts
+++ b/src/cli/runtime/serve-appimage-update.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdir, mkdtemp, readFile, rename, rm, utimes, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/cli/runtime/serve-bundle-park.test.ts b/src/cli/runtime/serve-bundle-park.test.ts
index 1fc2451c87f..cdee4308cee 100644
--- a/src/cli/runtime/serve-bundle-park.test.ts
+++ b/src/cli/runtime/serve-bundle-park.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises'
 import { realpathSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/serve-electron-preflight.test.ts b/src/cli/runtime/serve-electron-preflight.test.ts
index 52f69946661..a3b2c8f9ab6 100644
--- a/src/cli/runtime/serve-electron-preflight.test.ts
+++ b/src/cli/runtime/serve-electron-preflight.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync, unlinkSync, writeFileSync } from 'node:fs'
 import { createServer, type Socket } from 'node:net'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/serve-pairing-redaction.test.ts b/src/cli/runtime/serve-pairing-redaction.test.ts
index 79e902de53a..0793708999e 100644
--- a/src/cli/runtime/serve-pairing-redaction.test.ts
+++ b/src/cli/runtime/serve-pairing-redaction.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { PassThrough } from 'node:stream'
 import { ChildProcess } from 'node:child_process'
 import { once } from 'node:events'
diff --git a/src/cli/runtime/serve-pid1-init-reaper.test.ts b/src/cli/runtime/serve-pid1-init-reaper.test.ts
index a98cf72f32d..47477088215 100644
--- a/src/cli/runtime/serve-pid1-init-reaper.test.ts
+++ b/src/cli/runtime/serve-pid1-init-reaper.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { spawnSync } from 'node:child_process'
 import { existsSync } from 'node:fs'
 import { describe, expect, it, vi } from 'vitest'
diff --git a/src/cli/runtime/serve-signal-exit-diagnostic.test.ts b/src/cli/runtime/serve-signal-exit-diagnostic.test.ts
index 6e8b2654860..f9afaa9d528 100644
--- a/src/cli/runtime/serve-signal-exit-diagnostic.test.ts
+++ b/src/cli/runtime/serve-signal-exit-diagnostic.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { MacServeStartupAbortError, serveSignalExitError } from './serve-signal-exit-diagnostic'
 import { EventEmitter } from 'node:events'
 import { mkdtemp, rm } from 'node:fs/promises'
diff --git a/src/cli/runtime/serve-speech-recognizer.test.ts b/src/cli/runtime/serve-speech-recognizer.test.ts
index b81dddaa8a8..06178c268e6 100644
--- a/src/cli/runtime/serve-speech-recognizer.test.ts
+++ b/src/cli/runtime/serve-speech-recognizer.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/cli/runtime/serve-supervised-service.test.ts b/src/cli/runtime/serve-supervised-service.test.ts
index bfa645a4d7e..59d70afa3f5 100644
--- a/src/cli/runtime/serve-supervised-service.test.ts
+++ b/src/cli/runtime/serve-supervised-service.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/cli/runtime/serve-supervisor-policy.test.ts b/src/cli/runtime/serve-supervisor-policy.test.ts
index 51707fa6763..e08a9edd1e9 100644
--- a/src/cli/runtime/serve-supervisor-policy.test.ts
+++ b/src/cli/runtime/serve-supervisor-policy.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it } from 'vitest'
 import { decideAfterServeChildExit, type ServeChildExit } from './serve-supervisor-policy'
 
diff --git a/src/cli/runtime/serve-supervisor-relocation.test.ts b/src/cli/runtime/serve-supervisor-relocation.test.ts
index 8ae4272efea..9d2b202ef90 100644
--- a/src/cli/runtime/serve-supervisor-relocation.test.ts
+++ b/src/cli/runtime/serve-supervisor-relocation.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import {
   chmod,
   lstat,
diff --git a/src/cli/runtime/serve-update-supervisor-gate.test.ts b/src/cli/runtime/serve-update-supervisor-gate.test.ts
index 6ac287b521d..32659b64516 100644
--- a/src/cli/runtime/serve-update-supervisor-gate.test.ts
+++ b/src/cli/runtime/serve-update-supervisor-gate.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/cli/runtime/status-caller.test.ts b/src/cli/runtime/status-caller.test.ts
index 35e2987a704..99ceaa743f0 100644
--- a/src/cli/runtime/status-caller.test.ts
+++ b/src/cli/runtime/status-caller.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { createServer, type Server, type Socket } from 'node:net'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/status.test.ts b/src/cli/runtime/status.test.ts
index 5e8d2044c9f..24f14b42e25 100644
--- a/src/cli/runtime/status.test.ts
+++ b/src/cli/runtime/status.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, writeFileSync } from 'node:fs'
 import { createServer, type Socket } from 'node:net'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/transport-framing.test.ts b/src/cli/runtime/transport-framing.test.ts
index 0b7e2a2cb2d..7a446009a77 100644
--- a/src/cli/runtime/transport-framing.test.ts
+++ b/src/cli/runtime/transport-framing.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { EventEmitter } from 'node:events'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RuntimeMetadata } from '../../shared/runtime-bootstrap'
diff --git a/src/cli/runtime/transport.test.ts b/src/cli/runtime/transport.test.ts
index 03784569235..bc6a30ab84d 100644
--- a/src/cli/runtime/transport.test.ts
+++ b/src/cli/runtime/transport.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { once } from 'node:events'
 import { tmpdir } from 'node:os'
diff --git a/src/cli/runtime/types.test.ts b/src/cli/runtime/types.test.ts
index 99bfd23df44..5da6053007b 100644
--- a/src/cli/runtime/types.test.ts
+++ b/src/cli/runtime/types.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it } from 'vitest'
 import { RuntimeRpcFailureError } from './types'
 
diff --git a/src/main/ephemeral-vm/pending-vm-checkouts.test.ts b/src/main/ephemeral-vm/pending-vm-checkouts.test.ts
index ea9f1327b95..2fa947e15ba 100644
--- a/src/main/ephemeral-vm/pending-vm-checkouts.test.ts
+++ b/src/main/ephemeral-vm/pending-vm-checkouts.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it } from 'vitest'
 import {
   PendingVmCheckoutRegistry,
diff --git a/src/main/ephemeral-vm/recipe-runner.test.ts b/src/main/ephemeral-vm/recipe-runner.test.ts
index f33e92c02aa..610f759e07f 100644
--- a/src/main/ephemeral-vm/recipe-runner.test.ts
+++ b/src/main/ephemeral-vm/recipe-runner.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, realpathSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts b/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts
index 979c1ab4124..46a7d1f9346 100644
--- a/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts
+++ b/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ephemeral-vm/runtime-resume-pairing.test.ts b/src/main/ephemeral-vm/runtime-resume-pairing.test.ts
index 215765d86e5..fc5d478103a 100644
--- a/src/main/ephemeral-vm/runtime-resume-pairing.test.ts
+++ b/src/main/ephemeral-vm/runtime-resume-pairing.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ephemeral-vm/runtime-service.test.ts b/src/main/ephemeral-vm/runtime-service.test.ts
index 51e054d2265..fc29a08e049 100644
--- a/src/main/ephemeral-vm/runtime-service.test.ts
+++ b/src/main/ephemeral-vm/runtime-service.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts b/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts
index d40abe563a6..9c06d9729d3 100644
--- a/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts
+++ b/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ephemeral-vm/workspace-removal.test.ts b/src/main/ephemeral-vm/workspace-removal.test.ts
index 8f9fb764375..b39b095066d 100644
--- a/src/main/ephemeral-vm/workspace-removal.test.ts
+++ b/src/main/ephemeral-vm/workspace-removal.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts b/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts
index 9581d9a309e..d58447f1476 100644
--- a/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts
+++ b/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 // #34089 for VMs reached as paired Orca servers: a VM its provider stopped or reclaimed stays
 // recorded as running. Once Orca's own probes have failed for minutes, opening the workspace runs
 // the recipe's resume and keeps the device pairing unless the server came back with a new host key.
diff --git a/src/main/ephemeral-vm/workspace-resume-user-disconnect.test.ts b/src/main/ephemeral-vm/workspace-resume-user-disconnect.test.ts
index 1f66b3aeb73..c7e7dcbb8d7 100644
--- a/src/main/ephemeral-vm/workspace-resume-user-disconnect.test.ts
+++ b/src/main/ephemeral-vm/workspace-resume-user-disconnect.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 // #36923: a remote open can wake an SSH-connected recipe VM. If the user disconnects its host while
 // the recipe resumes, the wake must not reconnect it: the VM is up, and the host stays held.
 import { afterEach, describe, expect, it, vi } from 'vitest'
diff --git a/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts b/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts
index eb2736e5e5d..474b8b71ce6 100644
--- a/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts
+++ b/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts
@@ -1,4 +1,4 @@
-import '../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { existsSync, mkdtempSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts
index bf1b0cea5ef..9b3536287ed 100644
--- a/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts
+++ b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import '../../../../shared/protocol-version'
 import {
diff --git a/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts
index 1476d01f8a4..61e9baf2592 100644
--- a/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it } from 'vitest'
 import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { publicRuntimeEnvironmentWithHostKey } from './runtime-environment-host-key'
diff --git a/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts
index 99915dedac7..c6d580d9ace 100644
--- a/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts
index ccceda54fa7..6146eb8462e 100644
--- a/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, writeFileSync } from 'node:fs'
 import * as fs from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts
index af8dbb6e9b7..c6e947494e4 100644
--- a/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { pairedRuntimeConnectionFromOffer } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
 import { beforeEach, describe, expect, it } from 'vitest'
 import type { PairingOffer } from '../../../../shared/remote-runtime/pairing/mobile-relay-pairing-offer'
diff --git a/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts
index 677b9657aa8..6d0979154d4 100644
--- a/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { RemoteRuntimeSharedControlConnection } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-connection'
 import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
 import { afterEach, describe, expect, it, vi } from 'vitest'
diff --git a/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts
index a02278af19a..815d1d4c39e 100644
--- a/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 // #36923: a client reaches a recipe VM's workspace through the VM's own server, which is gone
 // while the VM sleeps. Opening the workspace wakes it; any other request leaves it asleep.
 import { mkdtempSync } from 'node:fs'
diff --git a/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts
index 3308fec46e1..49cf205032a 100644
--- a/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { OrcadManagedIdentityError } from '../../../managed-server/lifecycle/orcad-managed-tunnel-identity'
 
diff --git a/src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts b/src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts
index e2393119785..1813fb2d259 100644
--- a/src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts b/src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts
index f64784e31ae..d68897677aa 100644
--- a/src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts
index 3701cf720af..b9242e71933 100644
--- a/src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
 vi.mock('electron', () => ({ BrowserWindow: { getAllWindows: () => [] } }))
 import { mkdtempSync, rmSync } from 'node:fs'
diff --git a/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts
index 526b9ba52ae..beba99bdb47 100644
--- a/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 // #36923: opening a sleeping paired recipe VM wakes it, and the wake re-pairs its server. The
 // opening request is held to its caller's pairing as of before that wake, then to the pairing the
 // wake made; any other change still refuses it.
diff --git a/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts b/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts
index 53b2777121a..2f964075e58 100644
--- a/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 // #34089: whether a paired server's host may be gone comes only from dials Orca already makes:
 // its health probes and its control socket's reconnects.
 import { afterEach, describe, expect, it, vi } from 'vitest'
diff --git a/src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts
index ce63a1f1818..5eb1b2cdaa7 100644
--- a/src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts
index d93fe01b456..675d6d5941c 100644
--- a/src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts b/src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts
index 7d337bd1fe5..f01ea19585d 100644
--- a/src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts
+++ b/src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import * as environmentStore from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import * as setup from './runtime-environment-subscription-setup'
 import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
diff --git a/src/main/ipc/ssh/ssh-ipc-test-harness.ts b/src/main/ipc/ssh/ssh-ipc-test-harness.ts
index 566a5b30f0c..14dbb266e90 100644
--- a/src/main/ipc/ssh/ssh-ipc-test-harness.ts
+++ b/src/main/ipc/ssh/ssh-ipc-test-harness.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { vi } from 'vitest'
 import type { Mock } from 'vitest'
 import { registerSshHandlers, resetSshHandlerStateForTests } from './ssh'
diff --git a/src/main/ipc/wsl/wsl-move-host-connect.test.ts b/src/main/ipc/wsl/wsl-move-host-connect.test.ts
index 5c78913b325..cec3c3c2752 100644
--- a/src/main/ipc/wsl/wsl-move-host-connect.test.ts
+++ b/src/main/ipc/wsl/wsl-move-host-connect.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/managed-server/lifecycle/orcad-managed-tunnel-local-port.test.ts b/src/main/managed-server/lifecycle/orcad-managed-tunnel-local-port.test.ts
index e9e83002ee8..b34869f9f75 100644
--- a/src/main/managed-server/lifecycle/orcad-managed-tunnel-local-port.test.ts
+++ b/src/main/managed-server/lifecycle/orcad-managed-tunnel-local-port.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { createServer, type Server } from 'node:net'
 import { tmpdir } from 'node:os'
diff --git a/src/main/managed-server/lifecycle/orcad-runtime-forget.test.ts b/src/main/managed-server/lifecycle/orcad-runtime-forget.test.ts
index b9087f4c2ee..3be04e2208d 100644
--- a/src/main/managed-server/lifecycle/orcad-runtime-forget.test.ts
+++ b/src/main/managed-server/lifecycle/orcad-runtime-forget.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { rmSync } from 'node:fs'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { getManagedOrcadFenceEnvironmentId } from '../../../shared/managed-orcad-ssh-owner'
diff --git a/src/main/managed-server/lifecycle/orcad-runtime-maintenance.test.ts b/src/main/managed-server/lifecycle/orcad-runtime-maintenance.test.ts
index 5860d11fe09..4c0b9cf3c25 100644
--- a/src/main/managed-server/lifecycle/orcad-runtime-maintenance.test.ts
+++ b/src/main/managed-server/lifecycle/orcad-runtime-maintenance.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { rmSync } from 'node:fs'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
diff --git a/src/main/managed-server/migration/cutover/orcad-migration-delta-move.test.ts b/src/main/managed-server/migration/cutover/orcad-migration-delta-move.test.ts
index a6677973e63..cc089f111b4 100644
--- a/src/main/managed-server/migration/cutover/orcad-migration-delta-move.test.ts
+++ b/src/main/managed-server/migration/cutover/orcad-migration-delta-move.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/managed-server/migration/cutover/orcad-migration-delta-snapshot.test.ts b/src/main/managed-server/migration/cutover/orcad-migration-delta-snapshot.test.ts
index 0d5fe954224..e220c09ecb6 100644
--- a/src/main/managed-server/migration/cutover/orcad-migration-delta-snapshot.test.ts
+++ b/src/main/managed-server/migration/cutover/orcad-migration-delta-snapshot.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/managed-server/migration/cutover/orcad-unreachable-setup-release.test.ts b/src/main/managed-server/migration/cutover/orcad-unreachable-setup-release.test.ts
index 64ef933c287..34f0661010f 100644
--- a/src/main/managed-server/migration/cutover/orcad-unreachable-setup-release.test.ts
+++ b/src/main/managed-server/migration/cutover/orcad-unreachable-setup-release.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/managed-server/migration/linking/orcad-migration-repository-link.test.ts b/src/main/managed-server/migration/linking/orcad-migration-repository-link.test.ts
index 84654cf9f72..cb938362d44 100644
--- a/src/main/managed-server/migration/linking/orcad-migration-repository-link.test.ts
+++ b/src/main/managed-server/migration/linking/orcad-migration-repository-link.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/runtime/rpc/server/runtime-metadata.test.ts b/src/main/runtime/rpc/server/runtime-metadata.test.ts
index 190a26e46cd..95715094415 100644
--- a/src/main/runtime/rpc/server/runtime-metadata.test.ts
+++ b/src/main/runtime/rpc/server/runtime-metadata.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import nacl from 'tweetnacl'
 import { chmodSync, mkdtempSync, readdirSync, statSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.test.ts b/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.test.ts
index 5a2ad137bf7..20bd3bf926c 100644
--- a/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.test.ts
+++ b/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/ssh/runtime-access/runtime-ssh-access.test.ts b/src/main/ssh/runtime-access/runtime-ssh-access.test.ts
index 930cc03081b..1dd53913419 100644
--- a/src/main/ssh/runtime-access/runtime-ssh-access.test.ts
+++ b/src/main/ssh/runtime-access/runtime-ssh-access.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { pairedRuntimeConnectionFromOffer } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/main/wsl/host-lifecycle/wsl-host-automation-enable.test.ts b/src/main/wsl/host-lifecycle/wsl-host-automation-enable.test.ts
index 96a2ace2e34..c75e4af985f 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-automation-enable.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-automation-enable.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const hostRows = vi.hoisted(() => new Map<string, { enabled: boolean; updatedAt: number }>())
diff --git a/src/main/wsl/host-lifecycle/wsl-host-distro-list.test.ts b/src/main/wsl/host-lifecycle/wsl-host-distro-list.test.ts
index fdb25337e6f..4e09151f196 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-distro-list.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-distro-list.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it, vi } from 'vitest'
 import { listWslHostDistros } from './wsl-host-distro-list'
 
diff --git a/src/main/wsl/host-lifecycle/wsl-host-kept-for-peers.test.ts b/src/main/wsl/host-lifecycle/wsl-host-kept-for-peers.test.ts
index fffed1e44c3..48a68f321d5 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-kept-for-peers.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-kept-for-peers.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/wsl/host-lifecycle/wsl-host-pending-removal.test.ts b/src/main/wsl/host-lifecycle/wsl-host-pending-removal.test.ts
index 99708e926fa..778a5dbcbf5 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-pending-removal.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-pending-removal.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/wsl/host-lifecycle/wsl-host-server-stop.test.ts b/src/main/wsl/host-lifecycle/wsl-host-server-stop.test.ts
index 0a65aa1d5a2..4c40ad7b876 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-server-stop.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-server-stop.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { describe, expect, it, vi } from 'vitest'
 import type { OrcadDecommissionResult } from '../../../shared/orcad-decommission'
 import type { OrcadTerminalCensus } from '../../../shared/orcad-terminal-census'
diff --git a/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts b/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts
index 8126bbf621f..4d9e54d2139 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/wsl/host-lifecycle/wsl-host-service.test.ts b/src/main/wsl/host-lifecycle/wsl-host-service.test.ts
index efb3585543c..06d1cef5312 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-service.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-service.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/wsl/host-lifecycle/wsl-host-uninstall-server-stop.test.ts b/src/main/wsl/host-lifecycle/wsl-host-uninstall-server-stop.test.ts
index 8b84cde5fc3..8045c969665 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-uninstall-server-stop.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-uninstall-server-stop.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { spawnSync } from 'node:child_process'
 import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
diff --git a/src/main/wsl/host-lifecycle/wsl-hosts-policy-live-update.test.ts b/src/main/wsl/host-lifecycle/wsl-hosts-policy-live-update.test.ts
index 96369803aab..76f51e84992 100644
--- a/src/main/wsl/host-lifecycle/wsl-hosts-policy-live-update.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-hosts-policy-live-update.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/main/wsl/host-lifecycle/wsl-orphan-holder-release.test.ts b/src/main/wsl/host-lifecycle/wsl-orphan-holder-release.test.ts
index 1e570db7775..3f983da32f6 100644
--- a/src/main/wsl/host-lifecycle/wsl-orphan-holder-release.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-orphan-holder-release.test.ts
@@ -1,4 +1,4 @@
-import '../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
diff --git a/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts b/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts
index 6a93da0ca9a..9a89fecf4f8 100644
--- a/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts
+++ b/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { callRuntimeRpc, supportsCapability, store } = vi.hoisted(() => {
diff --git a/src/renderer/src/store/slices/ephemeral-vm/ephemeral-vm-lifecycle.test.ts b/src/renderer/src/store/slices/ephemeral-vm/ephemeral-vm-lifecycle.test.ts
index a3034f30532..263cadfa015 100644
--- a/src/renderer/src/store/slices/ephemeral-vm/ephemeral-vm-lifecycle.test.ts
+++ b/src/renderer/src/store/slices/ephemeral-vm/ephemeral-vm-lifecycle.test.ts
@@ -1,4 +1,4 @@
-import '../../../../../shared/remote-runtime/host-store/environment-store-worker.test-support'
+import '../../../../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { create } from 'zustand'
 import type { AppState } from '../../types'
diff --git a/src/shared/remote-runtime/host-store/environment-store-worker.test-support.ts b/src/shared/remote-runtime/host-store/environment-store-worker-test-fixture.ts
similarity index 100%
rename from src/shared/remote-runtime/host-store/environment-store-worker.test-support.ts
rename to src/shared/remote-runtime/host-store/environment-store-worker-test-fixture.ts
diff --git a/src/shared/remote-runtime/host-store/runtime-environment-store-worker.test.ts b/src/shared/remote-runtime/host-store/runtime-environment-store-worker.test.ts
index fbd4e18978d..463e63e4dae 100644
--- a/src/shared/remote-runtime/host-store/runtime-environment-store-worker.test.ts
+++ b/src/shared/remote-runtime/host-store/runtime-environment-store-worker.test.ts
@@ -1,4 +1,4 @@
-import './environment-store-worker.test-support'
+import './environment-store-worker-test-fixture'
 import {
   closeEnvironmentStore,
   environmentStoreWriteCount
diff --git a/tests/e2e/helpers/nested-runtime-same-id-pairing.ts b/tests/e2e/helpers/nested-runtime-same-id-pairing.ts
index d38f6390895..c07bf960770 100644
--- a/tests/e2e/helpers/nested-runtime-same-id-pairing.ts
+++ b/tests/e2e/helpers/nested-runtime-same-id-pairing.ts
@@ -20,7 +20,7 @@ export async function replaceRuntimePairingInPlace(args: {
   await args.page.evaluate(async (selector) => {
     await window.api.runtimeEnvironments.disconnect({ selector })
   }, args.environmentId)
-  const updated = updateEnvironmentFromPairingCode(args.userDataDir, args.environmentId, {
+  const updated = await updateEnvironmentFromPairingCode(args.userDataDir, args.environmentId, {
     pairingCode: args.pairingUrl
   })
   const hydrated = await args.page.evaluate(async (selector) => {