diff --git a/src/agents/session-tool-result-guard.test.ts b/src/agents/session-tool-result-guard.test.ts
index d93459d4f2d..9db8f1c580a 100644
--- a/src/agents/session-tool-result-guard.test.ts
+++ b/src/agents/session-tool-result-guard.test.ts
@@ -523,7 +523,7 @@ describe("installSessionToolResultGuard", () => {
 
     const persisted = getPersistedMessages(sm);
     expect(persisted.map((message) => message.role)).toEqual(["user"]);
-    expect(persisted[0]).toMatchObject({ content: "second" });
+    expect((persisted[0] as { content?: unknown } | undefined)?.content).toBe("second");
   });
 
   // When an assistant message with toolCalls is aborted, no synthetic toolResult
diff --git a/src/agents/session-tool-result-guard.transcript-events.test.ts b/src/agents/session-tool-result-guard.transcript-events.test.ts
index 752b7edad51..a9efbd24e56 100644
--- a/src/agents/session-tool-result-guard.transcript-events.test.ts
+++ b/src/agents/session-tool-result-guard.transcript-events.test.ts
@@ -41,12 +41,8 @@ describe("guardSessionManager transcript updates", () => {
     } as AgentMessage);
 
     expect(updates).toHaveLength(1);
-    expect(updates[0]).toMatchObject({
-      sessionFile,
-      sessionKey: "agent:main:worker",
-      message: {
-        role: "assistant",
-      },
-    });
+    expect(updates[0]?.sessionFile).toBe(sessionFile);
+    expect(updates[0]?.sessionKey).toBe("agent:main:worker");
+    expect((updates[0]?.message as { role?: string } | undefined)?.role).toBe("assistant");
   });
 });
diff --git a/src/agents/skills.buildworkspaceskillstatus.test.ts b/src/agents/skills.buildworkspaceskillstatus.test.ts
index 6ed286c68a6..94f2cc5d233 100644
--- a/src/agents/skills.buildworkspaceskillstatus.test.ts
+++ b/src/agents/skills.buildworkspaceskillstatus.test.ts
@@ -141,12 +141,10 @@ describe("buildWorkspaceSkillStatus", () => {
     expect(skill.eligible).toBe(false);
     expect(skill.requirements.bins).toEqual(["fakebin"]);
     expect(skill.missing.bins).toEqual(["fakebin"]);
-    expect(skill.install[0]).toMatchObject({
-      id: "brew",
-      kind: "brew",
-      label: "Install fakebin",
-      bins: ["fakebin"],
-    });
+    expect(skill.install[0]?.id).toBe("brew");
+    expect(skill.install[0]?.kind).toBe("brew");
+    expect(skill.install[0]?.label).toBe("Install fakebin");
+    expect(skill.install[0]?.bins).toEqual(["fakebin"]);
   });
 
   it("respects OS-gated skills", () => {
diff --git a/src/agents/skills/refresh.test.ts b/src/agents/skills/refresh.test.ts
index 005220fc81b..f3c7af80cfc 100644
--- a/src/agents/skills/refresh.test.ts
+++ b/src/agents/skills/refresh.test.ts
@@ -68,13 +68,9 @@ describe("ensureSkillsWatcher", () => {
     expect(opts.ignored).toBe(refreshModule.shouldIgnoreSkillsWatchPath);
     expect(opts.depth).toBe(2);
     const posix = (p: string) => p.replaceAll("\\", "/");
-    expect(targets).toEqual(
-      expect.arrayContaining([
-        posix(path.join("/tmp/workspace", "skills")),
-        posix(path.join("/tmp/workspace", ".agents", "skills")),
-        posix(path.join(os.homedir(), ".agents", "skills")),
-      ]),
-    );
+    expect(targets).toContain(posix(path.join("/tmp/workspace", "skills")));
+    expect(targets).toContain(posix(path.join("/tmp/workspace", ".agents", "skills")));
+    expect(targets).toContain(posix(path.join(os.homedir(), ".agents", "skills")));
     const wildcardTargets = targets.filter((target) => target.includes("*"));
     expect(wildcardTargets).toStrictEqual([]);
     const ignored = refreshModule.shouldIgnoreSkillsWatchPath;