diff --git a/src/agents/sandbox-skills.test.ts b/src/agents/sandbox-skills.test.ts
index ab0bc039c..88b1b5abb 100644
--- a/src/agents/sandbox-skills.test.ts
+++ b/src/agents/sandbox-skills.test.ts
@@ -130,33 +130,41 @@ describe("sandbox skill mirroring", () => {
     return { context, workspaceDir };
   };
 
-  it("copies skills into the sandbox when workspaceAccess is ro", async () => {
-    const { context } = await runContext("ro");
+  it(
+    "copies skills into the sandbox when workspaceAccess is ro",
+    async () => {
+      const { context } = await runContext("ro");
 
-    expect(context?.enabled).toBe(true);
-    const skillPath = path.join(
-      context?.workspaceDir ?? "",
-      "skills",
-      "demo-skill",
-      "SKILL.md",
-    );
-    await expect(fs.readFile(skillPath, "utf-8")).resolves.toContain(
-      "demo-skill",
-    );
-  });
+      expect(context?.enabled).toBe(true);
+      const skillPath = path.join(
+        context?.workspaceDir ?? "",
+        "skills",
+        "demo-skill",
+        "SKILL.md",
+      );
+      await expect(fs.readFile(skillPath, "utf-8")).resolves.toContain(
+        "demo-skill",
+      );
+    },
+    20_000,
+  );
 
-  it("copies skills into the sandbox when workspaceAccess is none", async () => {
-    const { context } = await runContext("none");
+  it(
+    "copies skills into the sandbox when workspaceAccess is none",
+    async () => {
+      const { context } = await runContext("none");
 
-    expect(context?.enabled).toBe(true);
-    const skillPath = path.join(
-      context?.workspaceDir ?? "",
-      "skills",
-      "demo-skill",
-      "SKILL.md",
-    );
-    await expect(fs.readFile(skillPath, "utf-8")).resolves.toContain(
-      "demo-skill",
-    );
-  });
+      expect(context?.enabled).toBe(true);
+      const skillPath = path.join(
+        context?.workspaceDir ?? "",
+        "skills",
+        "demo-skill",
+        "SKILL.md",
+      );
+      await expect(fs.readFile(skillPath, "utf-8")).resolves.toContain(
+        "demo-skill",
+      );
+    },
+    20_000,
+  );
 });
diff --git a/src/commands/doctor.test.ts b/src/commands/doctor.test.ts
index 7b42184bc..ad111efc0 100644
--- a/src/commands/doctor.test.ts
+++ b/src/commands/doctor.test.ts
@@ -636,13 +636,15 @@ describe("doctor", () => {
 
     expect(
       note.mock.calls.some(
-        ([message, title]) =>
-          title === "Sandbox" &&
-          typeof message === "string" &&
-          message
-            .replace(/\s+/g, " ")
-            .includes('agents.list (id "work") sandbox docker') &&
-          message.replace(/\s+/g, " ").includes('scope resolves to "shared"'),
+        ([message, title]) => {
+          if (title !== "Sandbox") return false;
+          if (typeof message !== "string") return false;
+          const normalized = message.replace(/\s+/g, " ");
+          return (
+            normalized.includes('agents.list (id "work") sandbox docker') &&
+            normalized.includes('scope resolves to "shared"')
+          );
+        },
       ),
     ).toBe(true);
   });