diff --git a/client/src/App.test.tsx b/client/src/App.test.tsx
index c2c75b9cc..d4ce33b88 100644
--- a/client/src/App.test.tsx
+++ b/client/src/App.test.tsx
@@ -74,14 +74,18 @@ describe('App', () => {
     render(<App />);
     expect(document.body).toBeInTheDocument();
     // Wait for auth check and lazy-loaded component to resolve
-    await waitFor(() => expect(screen.queryByText('Loading...')).not.toBeInTheDocument());
+    await waitFor(() => expect(screen.queryByText('Loading...')).not.toBeInTheDocument(), {
+      timeout: 5000,
+    });
   });
 
   it('renders the AppShell layout with sidebar and header', async () => {
     render(<App />);
 
     // Wait for auth loading to complete
-    await waitFor(() => expect(screen.queryByText('Loading...')).not.toBeInTheDocument());
+    await waitFor(() => expect(screen.queryByText('Loading...')).not.toBeInTheDocument(), {
+      timeout: 5000,
+    });
 
     // Sidebar should be present
     const sidebar = screen.getByRole('complementary');
diff --git a/e2e/tests/budget/budget-overview.spec.ts b/e2e/tests/budget/budget-overview.spec.ts
index 2b317732a..3353c7363 100644
--- a/e2e/tests/budget/budget-overview.spec.ts
+++ b/e2e/tests/budget/budget-overview.spec.ts
@@ -268,7 +268,9 @@ test.describe('Budget Health Hero', { tag: '@responsive' }, () => {
       await overviewPage.waitForLoaded();
 
       // Then: The BudgetBar stacked bar chart is visible (role="img")
-      await expect(page.getByRole('img')).toBeVisible({ timeout: 8000 });
+      await expect(page.getByRole('img', { name: /Budget breakdown/ })).toBeVisible({
+        timeout: 8000,
+      });
     } finally {
       await page.unroute(`${API.budgetOverview}`);
     }