diff --git a/src/__tests__/client-abort-signal.test.ts b/src/__tests__/agent-device-client-abort-signal.test.ts
similarity index 100%
rename from src/__tests__/client-abort-signal.test.ts
rename to src/__tests__/agent-device-client-abort-signal.test.ts
diff --git a/src/__tests__/client-apps.test.ts b/src/__tests__/agent-device-client-apps.test.ts
similarity index 100%
rename from src/__tests__/client-apps.test.ts
rename to src/__tests__/agent-device-client-apps.test.ts
diff --git a/src/__tests__/client-interactions-input-filtering.test.ts b/src/__tests__/agent-device-client-interactions-input-filtering.test.ts
similarity index 100%
rename from src/__tests__/client-interactions-input-filtering.test.ts
rename to src/__tests__/agent-device-client-interactions-input-filtering.test.ts
diff --git a/src/__tests__/client-leases.test.ts b/src/__tests__/agent-device-client-leases.test.ts
similarity index 100%
rename from src/__tests__/client-leases.test.ts
rename to src/__tests__/agent-device-client-leases.test.ts
diff --git a/src/__tests__/client-snapshot-keyboard-fact.test.ts b/src/__tests__/agent-device-client-snapshot-keyboard-fact.test.ts
similarity index 100%
rename from src/__tests__/client-snapshot-keyboard-fact.test.ts
rename to src/__tests__/agent-device-client-snapshot-keyboard-fact.test.ts
diff --git a/src/__tests__/client-snapshot-presented-surface.test.ts b/src/__tests__/agent-device-client-snapshot-presented-surface.test.ts
similarity index 100%
rename from src/__tests__/client-snapshot-presented-surface.test.ts
rename to src/__tests__/agent-device-client-snapshot-presented-surface.test.ts
diff --git a/src/__tests__/client-snapshot-truncation.test.ts b/src/__tests__/agent-device-client-snapshot-truncation.test.ts
similarity index 100%
rename from src/__tests__/client-snapshot-truncation.test.ts
rename to src/__tests__/agent-device-client-snapshot-truncation.test.ts
diff --git a/src/__tests__/client-snapshot-viewport.test.ts b/src/__tests__/agent-device-client-snapshot-viewport.test.ts
similarity index 100%
rename from src/__tests__/client-snapshot-viewport.test.ts
rename to src/__tests__/agent-device-client-snapshot-viewport.test.ts
diff --git a/src/__tests__/client-system-commands.test.ts b/src/__tests__/agent-device-client-system-commands.test.ts
similarity index 100%
rename from src/__tests__/client-system-commands.test.ts
rename to src/__tests__/agent-device-client-system-commands.test.ts
diff --git a/src/__tests__/client-wait.test.ts b/src/__tests__/agent-device-client-wait.test.ts
similarity index 100%
rename from src/__tests__/client-wait.test.ts
rename to src/__tests__/agent-device-client-wait.test.ts
diff --git a/src/__tests__/client.test.ts b/src/__tests__/agent-device-client.test.ts
similarity index 100%
rename from src/__tests__/client.test.ts
rename to src/__tests__/agent-device-client.test.ts
diff --git a/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts b/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts
index 9cb55401b0..00acdb29fe 100644
--- a/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts
@@ -1,7 +1,7 @@
 /**
  * #3178: the real client route, through the default transport.
  *
- * `daemon-client-abort.test.ts` drives `sendRequest` directly, and `client-abort-signal.test.ts`
+ * `daemon-client-abort.test.ts` drives `sendRequest` directly, and `agent-device-client-abort-signal.test.ts`
  * injects a fake transport, so neither proves that the caller's signal actually reaches the
  * transport from `createAgentDeviceClient`. That property lives at one line — the signal handed to
  * `sendRequest` in `daemon-client.ts` — and a test that skips that wiring cannot see it disappear: