diff --git a/src/gateway/server.sessions.compaction.test.ts b/src/gateway/server.sessions.compaction.test.ts
index 755be4d24bd..973cbeab7ab 100644
--- a/src/gateway/server.sessions.compaction.test.ts
+++ b/src/gateway/server.sessions.compaction.test.ts
@@ -16,7 +16,7 @@ import {
   getGatewayConfigModule,
   sessionStoreEntry,
   createCheckpointFixture,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.create.test.ts b/src/gateway/server.sessions.create.test.ts
index fe85bae5b34..72c9d816706 100644
--- a/src/gateway/server.sessions.create.test.ts
+++ b/src/gateway/server.sessions.create.test.ts
@@ -6,7 +6,7 @@ import {
   setupGatewaySessionsTestHarness,
   sessionStoreEntry,
   directSessionReq,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.delete-lifecycle.test.ts b/src/gateway/server.sessions.delete-lifecycle.test.ts
index f31062da8e6..adfd12572eb 100644
--- a/src/gateway/server.sessions.delete-lifecycle.test.ts
+++ b/src/gateway/server.sessions.delete-lifecycle.test.ts
@@ -15,7 +15,7 @@ import {
   sessionStoreEntry,
   expectActiveRunCleanup,
   directSessionReq,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.list-changed.test.ts b/src/gateway/server.sessions.list-changed.test.ts
index 3084bd512b4..34487e267cd 100644
--- a/src/gateway/server.sessions.list-changed.test.ts
+++ b/src/gateway/server.sessions.list-changed.test.ts
@@ -8,7 +8,7 @@ import {
   getSessionsHandlers,
   createDeferred,
   sessionStoreEntry,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.permissions-hooks.test.ts b/src/gateway/server.sessions.permissions-hooks.test.ts
index 51d2e31732a..081468f051e 100644
--- a/src/gateway/server.sessions.permissions-hooks.test.ts
+++ b/src/gateway/server.sessions.permissions-hooks.test.ts
@@ -18,7 +18,7 @@ import {
   sessionStoreEntry,
   createCheckpointFixture,
   isInternalHookEvent,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient, getHarness } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.preview-resolve.test.ts b/src/gateway/server.sessions.preview-resolve.test.ts
index 94f636661de..73d17171b3a 100644
--- a/src/gateway/server.sessions.preview-resolve.test.ts
+++ b/src/gateway/server.sessions.preview-resolve.test.ts
@@ -8,7 +8,7 @@ import {
   sessionStoreEntry,
   getMainPreviewEntry,
   directSessionReq,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.reset-cleanup.test.ts b/src/gateway/server.sessions.reset-cleanup.test.ts
index 55e3f882e21..78c41cf2e09 100644
--- a/src/gateway/server.sessions.reset-cleanup.test.ts
+++ b/src/gateway/server.sessions.reset-cleanup.test.ts
@@ -16,7 +16,7 @@ import {
   sessionStoreEntry,
   expectActiveRunCleanup,
   directSessionReq,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, seedActiveMainSession } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.reset-hooks.test.ts b/src/gateway/server.sessions.reset-hooks.test.ts
index 4054e521a8c..3ec77cefd8a 100644
--- a/src/gateway/server.sessions.reset-hooks.test.ts
+++ b/src/gateway/server.sessions.reset-hooks.test.ts
@@ -14,7 +14,7 @@ import {
   sessionStoreEntry,
   expectActiveRunCleanup,
   directSessionReq,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, seedActiveMainSession } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.reset-models.test.ts b/src/gateway/server.sessions.reset-models.test.ts
index 3e0ddc0deee..bec49f0bb8c 100644
--- a/src/gateway/server.sessions.reset-models.test.ts
+++ b/src/gateway/server.sessions.reset-models.test.ts
@@ -6,7 +6,7 @@ import {
   setupGatewaySessionsTestHarness,
   sessionStoreEntry,
   directSessionReq,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/server.sessions.store-rpc.test.ts b/src/gateway/server.sessions.store-rpc.test.ts
index 92bb5438987..1cc7728dac9 100644
--- a/src/gateway/server.sessions.store-rpc.test.ts
+++ b/src/gateway/server.sessions.store-rpc.test.ts
@@ -6,7 +6,7 @@ import {
   setupGatewaySessionsTestHarness,
   getGatewayConfigModule,
   getSessionsHandlers,
-} from "./test/server-sessions-helpers.js";
+} from "./test/server-sessions.test-helpers.js";
 
 const { createSessionStoreDir, openClient } = setupGatewaySessionsTestHarness();
 
diff --git a/src/gateway/test/server-sessions-helpers.ts b/src/gateway/test/server-sessions.test-helpers.ts
similarity index 100%
rename from src/gateway/test/server-sessions-helpers.ts
rename to src/gateway/test/server-sessions.test-helpers.ts