diff --git a/src/agents/skills/refresh.test.ts b/src/agents/skills/refresh.test.ts
index f26bf6e5de3..90ed78eed7c 100644
--- a/src/agents/skills/refresh.test.ts
+++ b/src/agents/skills/refresh.test.ts
@@ -81,8 +81,8 @@ describe("ensureSkillsWatcher", () => {
     expect(watchMock).toHaveBeenCalledTimes(1);
     const watchedPaths = watchMock.mock.calls[0]?.[0] as string[];
 
-    // Should include workspace skills, managed skills, and bundled skills
-    expect(watchedPaths).toContain("/tmp/workspace-bundled-test/skills");
-    expect(watchedPaths).toContain("/mock/package/root/skills");
+    // Should include workspace skills and bundled skills (as SKILL.md globs)
+    expect(watchedPaths.some((p) => p.startsWith("/tmp/workspace-bundled-test/skills"))).toBe(true);
+    expect(watchedPaths.some((p) => p.startsWith("/mock/package/root/skills"))).toBe(true);
   });
 });
diff --git a/src/cli/run-main.exit.test.ts b/src/cli/run-main.exit.test.ts
index 86d74f09640..3135eb3b18e 100644
--- a/src/cli/run-main.exit.test.ts
+++ b/src/cli/run-main.exit.test.ts
@@ -15,9 +15,13 @@ vi.mock("../infra/dotenv.js", () => ({
   loadDotEnv: loadDotEnvMock,
 }));
 
-vi.mock("../infra/env.js", () => ({
-  normalizeEnv: normalizeEnvMock,
-}));
+vi.mock("../infra/env.js", async (importOriginal) => {
+  const actual = await importOriginal();
+  return {
+    ...actual,
+    normalizeEnv: normalizeEnvMock,
+  };
+});
 
 vi.mock("../infra/path-env.js", () => ({
   ensureOpenClawCliOnPath: ensurePathMock,
diff --git a/src/commands/models.auth.provider-resolution.test.ts b/src/commands/models.auth.provider-resolution.test.ts
index 11cc6d934ac..bcd07699752 100644
--- a/src/commands/models.auth.provider-resolution.test.ts
+++ b/src/commands/models.auth.provider-resolution.test.ts
@@ -42,7 +42,7 @@ describe("resolveRequestedLoginProviderOrThrow", () => {
     expect(() =>
       resolveRequestedLoginProviderOrThrow(providers, "google-antigravity"),
     ).toThrowError(
-      'Unknown provider "google-antigravity". Loaded providers: google-gemini-cli, qwen-portal. Verify plugins via `openclaw plugins list --json`.',
+      'Unknown provider "google-antigravity". Loaded providers: google-gemini-cli, qwen-portal. Verify plugins via `ironclaw plugins list --json`.',
     );
   });
 });
diff --git a/src/telegram/bot.create-telegram-bot.test.ts b/src/telegram/bot.create-telegram-bot.test.ts
index a30d391dd75..c17e081bf6e 100644
--- a/src/telegram/bot.create-telegram-bot.test.ts
+++ b/src/telegram/bot.create-telegram-bot.test.ts
@@ -274,7 +274,7 @@ describe("createTelegramBot", () => {
     expect(pairingText).toContain("Your Telegram user id: 999");
     expect(pairingText).toContain("Pairing code:");
     expect(pairingText).toContain("PAIRME12");
-    expect(pairingText).toContain("openclaw pairing approve telegram PAIRME12");
+    expect(pairingText).toContain("ironclaw pairing approve telegram PAIRME12");
     expect(pairingText).not.toContain("<code>");
   });
   it("does not resend pairing code when a request is already pending", async () => {