diff --git a/packages/core/test/tool-question.test.ts b/packages/core/test/tool-question.test.ts
index dfd45715ec8..520dbe3225f 100644
--- a/packages/core/test/tool-question.test.ts
+++ b/packages/core/test/tool-question.test.ts
@@ -45,28 +45,19 @@ const permission = permissionLayer({
       ),
     ),
 })
-const form = Layer.succeed(
-  Form.Service,
-  Form.Service.of({
-    ask: (input: Form.CreateInput) =>
-      Effect.sync(() => {
-        captured = input
-      }).pipe(
-        Effect.andThen(
-          Effect.sync(
-            (): Form.TerminalState =>
-              reject ? { status: "cancelled" } : { status: "answered", answer: { q0: "Build", q1: ["Dev"] } },
-          ),
+const form = Layer.mock(Form.Service, {
+  ask: (input: Form.CreateInput) =>
+    Effect.sync(() => {
+      captured = input
+    }).pipe(
+      Effect.andThen(
+        Effect.sync(
+          (): Form.TerminalState =>
+            reject ? { status: "cancelled" } : { status: "answered", answer: { q0: "Build", q1: ["Dev"] } },
         ),
       ),
-    create: () => Effect.die("unused"),
-    get: () => Effect.die("unused"),
-    list: () => Effect.die("unused"),
-    state: () => Effect.die("unused"),
-    reply: () => Effect.die("unused"),
-    cancel: () => Effect.die("unused"),
-  }),
-)
+    ),
+})
 const questionToolNode = makeLocationNode({
   name: "test/question-tool-plugin",
   layer: Layer.effectDiscard(registerToolPlugin(QuestionTool.Plugin)),
@@ -114,6 +105,7 @@ describe("QuestionTool", () => {
     Effect.gen(function* () {
       captured = undefined
       deny = true
+      yield* Effect.addFinalizer(() => Effect.sync(() => (deny = false)))
       const registry = yield* Tool.Service
 
       expect(
@@ -135,7 +127,6 @@ describe("QuestionTool", () => {
         },
       })
       expect(capturedInput()).toBeUndefined()
-      deny = false
     }),
   )
 
diff --git a/packages/core/test/tool-skill.test.ts b/packages/core/test/tool-skill.test.ts
index ded7c652744..a4f93e1c111 100644
--- a/packages/core/test/tool-skill.test.ts
+++ b/packages/core/test/tool-skill.test.ts
@@ -69,15 +69,10 @@ describe("SkillTool", () => {
                 ),
               ),
           })
-          const skills = Layer.succeed(
-            Skill.Service,
-            Skill.Service.of({
-              transform: (_transform) => Effect.die("unused"),
-              reload: () => Effect.die("unused"),
-              get: (id) => Effect.succeed(current.find((skill) => skill.id === id)),
-              list: () => Effect.succeed(current),
-            }),
-          )
+          const skills = Layer.mock(Skill.Service, {
+            get: (id) => Effect.succeed(current.find((skill) => skill.id === id)),
+            list: () => Effect.succeed(current),
+          })
           const skillToolLayer = AppNodeBuilder.build(LayerNode.group([Tool.node, skillToolNode]), [
             [Permission.node, permission],
             [Skill.node, skills],