diff --git a/extensions/mattermost/src/setup-surface.ts b/extensions/mattermost/src/setup-surface.ts
index fe11f736263..e6de03faf5e 100644
--- a/extensions/mattermost/src/setup-surface.ts
+++ b/extensions/mattermost/src/setup-surface.ts
@@ -31,7 +31,9 @@ export const mattermostSetupWizard: ChannelSetupWizard = {
     configuredScore: 2,
     unconfiguredScore: 1,
     resolveConfigured: ({ cfg, accountId }) =>
-      isMattermostConfigured(resolveMattermostAccountWithSecrets(cfg, accountId ?? undefined)),
+      isMattermostConfigured(
+        resolveMattermostAccountWithSecrets(cfg, accountId ?? DEFAULT_ACCOUNT_ID),
+      ),
   }),
   introNote: {
     title: "Mattermost bot token",
diff --git a/src/cli/qr-cli.test.ts b/src/cli/qr-cli.test.ts
index be383d04ec9..4f71691c05f 100644
--- a/src/cli/qr-cli.test.ts
+++ b/src/cli/qr-cli.test.ts
@@ -1,13 +1,13 @@
 import { Command } from "commander";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { encodePairingSetupCode } from "../pairing/setup-code.js";
-import type { OutputRuntimeEnv } from "../runtime.js";
+import type { CliMockOutputRuntime } from "./test-runtime-capture.js";
 
 const runtimeState = vi.hoisted(() => {
   const runtimeLogs: string[] = [];
   const runtimeErrors: string[] = [];
   const stringifyArgs = (args: unknown[]) => args.map((value) => String(value)).join(" ");
-  const defaultRuntime: OutputRuntimeEnv = {
+  const defaultRuntime: CliMockOutputRuntime = {
     log: vi.fn((...args: unknown[]) => {
       runtimeLogs.push(stringifyArgs(args));
     }),
diff --git a/src/cli/qr-dashboard.integration.test.ts b/src/cli/qr-dashboard.integration.test.ts
index bb489f9bae1..a7406566624 100644
--- a/src/cli/qr-dashboard.integration.test.ts
+++ b/src/cli/qr-dashboard.integration.test.ts
@@ -2,15 +2,22 @@ import { Command } from "commander";
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import type { RuntimeEnv } from "../runtime.js";
 import { captureEnv } from "../test-utils/env.js";
+import type { MockFn } from "../test-utils/vitest-mock-fn.js";
 
 const loadConfigMock = vi.hoisted(() => vi.fn());
 const readConfigFileSnapshotMock = vi.hoisted(() => vi.fn());
 const resolveGatewayPortMock = vi.hoisted(() => vi.fn(() => 18789));
 const copyToClipboardMock = vi.hoisted(() => vi.fn(async () => false));
 
+type CliRuntimeEnv = RuntimeEnv & {
+  log: MockFn<RuntimeEnv["log"]>;
+  error: MockFn<RuntimeEnv["error"]>;
+  exit: MockFn<RuntimeEnv["exit"]>;
+};
+
 const runtimeLogs: string[] = [];
 const runtimeErrors: string[] = [];
-const runtime = vi.hoisted<RuntimeEnv>(() => ({
+const runtime = vi.hoisted<CliRuntimeEnv>(() => ({
   log: (...args: unknown[]) => {
     runtimeLogs.push(args.map(String).join(" "));
   },