diff --git a/src/commands/doctor.migrates-routing-allowfrom-channels-whatsapp-allowfrom.test.ts b/src/commands/doctor.migrates-routing-allowfrom-channels-whatsapp-allowfrom.test.ts
index 95fe4be23f4..4cece369684 100644
--- a/src/commands/doctor.migrates-routing-allowfrom-channels-whatsapp-allowfrom.test.ts
+++ b/src/commands/doctor.migrates-routing-allowfrom-channels-whatsapp-allowfrom.test.ts
@@ -54,9 +54,11 @@ describe("doctor command", () => {
     const remote = gateway.remote as Record<string, unknown>;
     const channels = (written.channels as Record<string, unknown>) ?? {};
 
-    expect(channels.whatsapp).toEqual({
-      allowFrom: ["+15555550123"],
-    });
+    expect(channels.whatsapp).toEqual(
+      expect.objectContaining({
+        allowFrom: ["+15555550123"],
+      }),
+    );
     expect(written.routing).toBeUndefined();
     expect(remote.token).toBe("legacy-remote-token");
     expect(auth).toBeUndefined();
diff --git a/src/discord/monitor/threading.parent-info.test.ts b/src/discord/monitor/threading.parent-info.test.ts
index 1954dd4fe9d..6d2d169002c 100644
--- a/src/discord/monitor/threading.parent-info.test.ts
+++ b/src/discord/monitor/threading.parent-info.test.ts
@@ -1,8 +1,13 @@
 import { ChannelType } from "@buape/carbon";
-import { describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { __resetDiscordChannelInfoCacheForTest } from "./message-utils.js";
 import { resolveDiscordThreadParentInfo } from "./threading.js";
 
 describe("resolveDiscordThreadParentInfo", () => {
+  beforeEach(() => {
+    __resetDiscordChannelInfoCacheForTest();
+  });
+
   it("falls back to fetched thread parentId when parentId is missing in payload", async () => {
     const fetchChannel = vi.fn(async (channelId: string) => {
       if (channelId === "thread-1") {