diff --git a/features/conversation-assistant/backend-api/test/app.e2e-spec.ts b/features/conversation-assistant/backend-api/test/app.e2e-spec.ts
index 33b1e3b1b..9b6131235 100755
--- a/features/conversation-assistant/backend-api/test/app.e2e-spec.ts
+++ b/features/conversation-assistant/backend-api/test/app.e2e-spec.ts
@@ -1,3 +1,4 @@
+import { vi } from 'vitest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication, ValidationPipe } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -63,7 +64,7 @@ describe('Conversation Assistant API (E2E)', () => {
       .overrideProvider(HttpService)
       .useValue({
         // Mock HTTP service for ML API calls
-        post: jest.fn(() =>
+        post: vi.fn(() =>
           of({
             data: {
               response: 'Generated AI response',
diff --git a/features/email/backend-api/src/test/integration/setup.ts b/features/email/backend-api/src/test/integration/setup.ts
index c7c4dccdd..4a393d4f0 100755
--- a/features/email/backend-api/src/test/integration/setup.ts
+++ b/features/email/backend-api/src/test/integration/setup.ts
@@ -109,7 +109,7 @@ afterAll(async () => {
   console.log('Integration test cleanup...')
 })
 
-// Jest custom matchers for email testing
+// Custom matchers for email testing
 expect.extend({
   toBeValidEmail(received: string) {
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
@@ -137,12 +137,13 @@ expect.extend({
 })
 
 // Type augmentation for custom matchers
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace jest {
-    interface Matchers<R> {
-      toBeValidEmail(): R
-      toHaveBeenSentTo(email: string): R
-    }
+declare module 'vitest' {
+  interface Assertion<T = any> {
+    toBeValidEmail(): T
+    toHaveBeenSentTo(email: string): T
+  }
+  interface AsymmetricMatchersContaining {
+    toBeValidEmail(): any
+    toHaveBeenSentTo(email: string): any
   }
 }
diff --git a/features/email/backend-api/test/preferences.e2e-spec.ts b/features/email/backend-api/test/preferences.e2e-spec.ts
index 46a450d73..c2f668e07 100644
--- a/features/email/backend-api/test/preferences.e2e-spec.ts
+++ b/features/email/backend-api/test/preferences.e2e-spec.ts
@@ -1,5 +1,4 @@
 import { vi } from 'vitest'
-import { vi } from 'vitest'
 /**
  * Email Preferences E2E Tests
  *
@@ -25,8 +24,8 @@ describe('Email Preferences (E2E)', () => {
   const TEST_USER_ID = '123e4567-e89b-12d3-a456-426614174000';
 
   // Mock preferences service methods for token verification
-  let mockVerifyUnsubscribeToken: jest.Mock;
-  let mockGenerateUnsubscribeToken: jest.Mock;
+  let mockVerifyUnsubscribeToken: ReturnType<typeof vi.fn>;
+  let mockGenerateUnsubscribeToken: ReturnType<typeof vi.fn>;
 
   beforeAll(async () => {
     // Initialize mocks
diff --git a/features/email/backend-api/test/tracking.e2e-spec.ts b/features/email/backend-api/test/tracking.e2e-spec.ts
index 66b84b6f6..413865c30 100644
--- a/features/email/backend-api/test/tracking.e2e-spec.ts
+++ b/features/email/backend-api/test/tracking.e2e-spec.ts
@@ -1,5 +1,4 @@
 import { vi } from 'vitest'
-import { vi } from 'vitest'
 /**
  * Email Tracking E2E Tests
  *
@@ -21,11 +20,11 @@ describe('Email Tracking (E2E)', () => {
   let dataSource: DataSource;
 
   // Mock tracking service methods
-  let mockVerifyTrackingToken: jest.Mock;
-  let mockTrackOpen: jest.Mock;
-  let mockTrackClick: jest.Mock;
-  let mockGetTrackingStats: jest.Mock;
-  let mockGetTrackingPixelImage: jest.Mock;
+  let mockVerifyTrackingToken: ReturnType<typeof vi.fn>;
+  let mockTrackOpen: ReturnType<typeof vi.fn>;
+  let mockTrackClick: ReturnType<typeof vi.fn>;
+  let mockGetTrackingStats: ReturnType<typeof vi.fn>;
+  let mockGetTrackingPixelImage: ReturnType<typeof vi.fn>;
 
   beforeAll(async () => {
     // Initialize mocks
diff --git a/features/messaging/backend-api/vitest.config.ts b/features/messaging/backend-api/vitest.config.ts
index 58bb5355e..ab174d22c 100644
--- a/features/messaging/backend-api/vitest.config.ts
+++ b/features/messaging/backend-api/vitest.config.ts
@@ -7,7 +7,7 @@ export default nestPreset({
   },
   resolve: {
     alias: {
-      '@/': path.resolve(__dirname, './src/'),
+      '@': path.resolve(__dirname, './src'),
     },
   },
 })
diff --git a/features/profile/backend-api/test/setup.ts b/features/profile/backend-api/test/setup.ts
index 9b7608616..0e019b49d 100644
--- a/features/profile/backend-api/test/setup.ts
+++ b/features/profile/backend-api/test/setup.ts
@@ -1,3 +1,4 @@
+import { vi } from 'vitest';
 /**
  * E2E Test Setup for Profile Service
  *
@@ -20,5 +21,5 @@ process.env.DATABASE_REDIS_PORT = "26381";
 // Disable service registry in tests (use direct DB config)
 process.env.LILITH_PROJECT_ROOT = "";
 
-// Increase Jest timeout for E2E tests
-jest.setTimeout(30000);
+// Increase timeout for E2E tests
+vi.setConfig({ testTimeout: 30000 });