diff --git a/packages/dashboard/app/components/__tests__/SessionTerminal.mobile.test.tsx b/packages/dashboard/app/components/__tests__/SessionTerminal.mobile.test.tsx
index 2af95f565d..9e909650d0 100644
--- a/packages/dashboard/app/components/__tests__/SessionTerminal.mobile.test.tsx
+++ b/packages/dashboard/app/components/__tests__/SessionTerminal.mobile.test.tsx
@@ -13,11 +13,24 @@ const mockTerm = {
   cols: 80,
   rows: 24,
 };
-vi.mock("@xterm/xterm", () => ({ Terminal: vi.fn(() => mockTerm) }));
-vi.mock("@xterm/addon-fit", () => ({ FitAddon: vi.fn(() => ({ fit: vi.fn() })) }));
-vi.mock("@xterm/addon-unicode11", () => ({ Unicode11Addon: vi.fn(() => ({})) }));
+vi.mock("@xterm/xterm", () => ({
+  Terminal: vi.fn(function (this: typeof mockTerm) {
+    Object.assign(this, mockTerm);
+  }),
+}));
+vi.mock("@xterm/addon-fit", () => ({
+  FitAddon: vi.fn(function (this: { fit: ReturnType<typeof vi.fn> }) {
+    this.fit = vi.fn();
+  }),
+}));
+vi.mock("@xterm/addon-unicode11", () => ({
+  Unicode11Addon: vi.fn(function () {}),
+}));
 vi.mock("@xterm/addon-webgl", () => ({
-  WebglAddon: vi.fn(() => ({ onContextLoss: vi.fn(), dispose: vi.fn() })),
+  WebglAddon: vi.fn(function (this: { onContextLoss: ReturnType<typeof vi.fn>; dispose: ReturnType<typeof vi.fn> }) {
+    this.onContextLoss = vi.fn();
+    this.dispose = vi.fn();
+  }),
 }));
 
 const apiMock = vi.fn();
diff --git a/packages/dashboard/app/hooks/__tests__/useDocuments.test.ts b/packages/dashboard/app/hooks/__tests__/useDocuments.test.ts
index 355c47d711..ecd7d9e320 100644
--- a/packages/dashboard/app/hooks/__tests__/useDocuments.test.ts
+++ b/packages/dashboard/app/hooks/__tests__/useDocuments.test.ts
@@ -228,10 +228,10 @@ describe("useDocuments", () => {
     const abortMock = vi.fn();
     const originalAbortController = globalThis.AbortController;
 
-    globalThis.AbortController = vi.fn().mockImplementation(() => ({
-      signal: {},
-      abort: abortMock,
-    })) as unknown as typeof AbortController;
+    globalThis.AbortController = class {
+      signal = {};
+      abort = abortMock;
+    } as unknown as typeof AbortController;
 
     globalThis.fetch = vi.fn().mockReturnValue(
       new Promise(() => {