diff --git a/src/gateway/test-helpers.ts b/src/gateway/test-helpers.ts
index 83074eb0e17..0e9d7d1fdbb 100644
--- a/src/gateway/test-helpers.ts
+++ b/src/gateway/test-helpers.ts
@@ -1,5 +1,34 @@
-export * from "./test-helpers.runtime-state.js";
-export * from "./test-helpers.plugin-registry.js";
-export * from "./test-helpers.config-snapshots.js";
-export * from "./test-helpers.mocks.js";
-export * from "./test-helpers.server.js";
+export {
+  agentCommand,
+  cronIsolatedRun,
+  dispatchInboundMessageMock,
+  embeddedRunMock,
+  getReplyFromConfig,
+  mockGetReplyFromConfigOnce,
+  piSdkMock,
+  testState,
+  testTailnetIPv4,
+  testTailscaleWhois,
+} from "./test-helpers.runtime-state.js";
+export { resetTestPluginRegistry, setTestPluginRegistry } from "./test-helpers.plugin-registry.js";
+export {
+  connectOk,
+  connectReq,
+  connectWebchatClient,
+  createGatewaySuiteHarness,
+  getFreePort,
+  getTrackedConnectChallengeNonce,
+  installGatewayTestHooks,
+  onceMessage,
+  readConnectChallengeNonce,
+  rpcReq,
+  startConnectedServerWithClient,
+  startGatewayServer,
+  startGatewayServerWithRetries,
+  startServer,
+  startServerWithClient,
+  trackConnectChallengeNonce,
+  waitForSystemEvent,
+  withGatewayServer,
+  writeSessionStore,
+} from "./test-helpers.server.js";