diff --git a/frontend/src/__tests__/components/AMSHistoryModal.test.tsx b/frontend/src/__tests__/components/AMSHistoryModal.test.tsx
index 091bbb078..daac6125b 100644
--- a/frontend/src/__tests__/components/AMSHistoryModal.test.tsx
+++ b/frontend/src/__tests__/components/AMSHistoryModal.test.tsx
@@ -243,7 +243,7 @@ describe('AMSHistoryModal', () => {
     render(<AMSHistoryModal {...defaultProps} />);
 
     await waitFor(() => {
-      expect(screen.getByText('Error loading data')).toBeInTheDocument();
+      expect(screen.getByText('Error')).toBeInTheDocument();
     });
   });
 
@@ -261,7 +261,7 @@ describe('AMSHistoryModal', () => {
     render(<AMSHistoryModal {...defaultProps} />);
 
     await waitFor(() => {
-      expect(screen.getByText('No data available for this time range')).toBeInTheDocument();
+      expect(screen.getByText('No data available')).toBeInTheDocument();
     });
   });
 
diff --git a/frontend/src/__tests__/setup.ts b/frontend/src/__tests__/setup.ts
index 1855f0eb3..bf62d5c06 100644
--- a/frontend/src/__tests__/setup.ts
+++ b/frontend/src/__tests__/setup.ts
@@ -8,6 +8,9 @@ import { afterAll, afterEach, beforeAll, vi } from 'vitest';
 import { cleanup } from '@testing-library/react';
 import { server } from './mocks/server';
 
+// Initialize i18n for tests (suppresses react-i18next warnings)
+import '../i18n';
+
 // Setup MSW server - bypass WebSocket requests so our mock handles them
 beforeAll(() =>
   server.listen({