diff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.ts
index a4b1d9df2e3daa2fc659315b74d1c4ab8620184f..b0385cb029b57a632c6047e75cadf45fb260ac5b 100644
--- a/apps/server/src/keybindings.test.ts
+++ b/apps/server/src/keybindings.test.ts
@@ -620,7 +620,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const configState = yield* keybindings.loadConfigState;
       assert.deepEqual(configState.issues, []);
       assert.isTrue(configState.keybindings.some((entry) => entry.command === "terminal.toggle"));
-    }).pipe(Effect.provide(makeKeybindingsLayer())),
+    }).pipe(Effect.provide(layerKeybindings())),
   );
 
   it.effect("updates cached resolved config after upsert", () =>
diff --git a/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts b/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
index a48146970652c128d053bce75e901cdfbf6afd37..61a3dedafd53f99fbcb361bd8d8460ddeeb56bbd 100644
--- a/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
@@ -930,7 +930,7 @@ it.effect("ProviderSessionManagerV2 records provider session and turn metrics",
     });
 
     yield* effect.pipe(
-      Effect.provide(makeTestLayer({ state, idleTimeoutMs: 60_000 })),
+      Effect.provide(layerTest({ state, idleTimeoutMs: 60_000 })),
       // A private registry keeps other tests' provider metrics out of the assertions.
       Effect.provideService(Metric.MetricRegistry, new Map()),
     );
diff --git a/apps/server/src/serverSettings.test.ts b/apps/server/src/serverSettings.test.ts
index ad1c92848dfc95532752163879939d557eef5bea..4376d5d7ea69b9c07f99f8922d15921c6c884249 100644
--- a/apps/server/src/serverSettings.test.ts
+++ b/apps/server/src/serverSettings.test.ts
@@ -49,7 +49,7 @@ const layerServerSettings = () =>
     ),
   );
 
-/** Like `makeServerSettingsLayer`, but also exposes the secret store for assertions. */
+/** Like `layerServerSettings`, but also exposes the secret store for assertions. */
 const layerServerSettingsWithSecrets = () =>
   ServerSettingsModule.layer.pipe(
     Layer.provideMerge(ServerSecretStore.layer),
@@ -322,7 +322,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
 
       const settings = yield* serverSettings.getSettings;
       assert.equal(settings.responseStreamingMode, "turn");
-    }).pipe(Effect.provide(makeServerSettingsLayer())),
+    }).pipe(Effect.provide(layerServerSettings())),
   );
 
   it.effect("decodes nested settings patches", () =>