diff --git a/apps/web/src/app/api/events/backfill/__tests__/route.test.ts b/apps/web/src/app/api/events/backfill/__tests__/route.test.ts
index 587fbc3f67..25dc51ce72 100644
--- a/apps/web/src/app/api/events/backfill/__tests__/route.test.ts
+++ b/apps/web/src/app/api/events/backfill/__tests__/route.test.ts
@@ -1,7 +1,7 @@
 // pnpm test src/app/api/events/backfill/__tests__/route.test.ts
 
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
 import { NextRequest } from 'next/server';
 
 import { authorizeApi } from '@/actions/auth';
@@ -296,8 +296,8 @@ describe('/api/events/backfill', () => {
       say: 'api_req_started',
     });
 
-    expect(textMessage?.timestamp).toBeTypeOf('number');
-    expect(apiMessage?.timestamp).toBeTypeOf('number');
+    expect(typeof textMessage?.timestamp).toBe('number');
+    expect(typeof apiMessage?.timestamp).toBe('number');
 
     const messageTypes = dbData.map((item) => item.say);
     expect(messageTypes).toContain('text');
diff --git a/apps/web/vitest.setup.client.ts b/apps/web/vitest.setup.client.ts
index bd29e7fba8..d30b4cc7bd 100644
--- a/apps/web/vitest.setup.client.ts
+++ b/apps/web/vitest.setup.client.ts
@@ -1,12 +1,14 @@
 import '@testing-library/jest-dom';
 
-(global as any).ResizeObserver = vi.fn().mockImplementation(() => ({
+// Mock ResizeObserver
+globalThis.ResizeObserver = vi.fn().mockImplementation(() => ({
   observe: vi.fn(),
   unobserve: vi.fn(),
   disconnect: vi.fn(),
 }));
 
-(global as any).IntersectionObserver = vi.fn().mockImplementation(() => ({
+// Mock IntersectionObserver
+globalThis.IntersectionObserver = vi.fn().mockImplementation(() => ({
   observe: vi.fn(),
   unobserve: vi.fn(),
   disconnect: vi.fn(),