diff --git a/e2e/tns-csi.spec.ts b/e2e/tns-csi.spec.ts
index a311bc2..5ef6c08 100644
--- a/e2e/tns-csi.spec.ts
+++ b/e2e/tns-csi.spec.ts
@@ -1,30 +1,37 @@
 import { test, expect } from '@playwright/test';
 
+async function waitForSidebar(page: import('@playwright/test').Page) {
+  const sidebar = page.getByRole('navigation', { name: 'Navigation' });
+  await expect(sidebar).toBeVisible({ timeout: 15_000 });
+  await page.waitForLoadState('networkidle');
+  return sidebar;
+}
+
 test.describe('TNS CSI plugin smoke tests', () => {
   test('sidebar contains TNS CSI entry', async ({ page }) => {
     await page.goto('/');
-    const sidebar = page.getByRole('navigation', { name: 'Navigation' });
-    await expect(sidebar).toBeVisible({ timeout: 15_000 });
+    const sidebar = await waitForSidebar(page);
     await expect(sidebar.getByRole('button', { name: /tns.csi/i })).toBeVisible();
   });
 
   test('TNS CSI sidebar entry navigates to TNS CSI view', async ({ page }) => {
     await page.goto('/');
-    const sidebar = page.getByRole('navigation', { name: 'Navigation' });
-    await expect(sidebar).toBeVisible({ timeout: 15_000 });
+    const sidebar = await waitForSidebar(page);
 
     const entry = sidebar.getByRole('button', { name: /tns.csi/i });
     await expect(entry).toBeVisible();
     await entry.click();
 
+    await page.waitForLoadState('networkidle');
     await expect(page).toHaveURL(/tns-csi/);
-    await expect(page.getByRole('heading', { name: /TNS.CSI/i })).toBeVisible();
+    await expect(page.getByRole('heading', { name: /tns.csi.*overview/i })).toBeVisible();
   });
 
   test('TNS CSI page renders content', async ({ page }) => {
     await page.goto('/c/main/tns-csi');
+    await waitForSidebar(page);
 
-    await expect(page.getByRole('heading', { name: /TNS.CSI/i })).toBeVisible({
+    await expect(page.getByRole('heading', { name: /tns.csi.*overview/i })).toBeVisible({
       timeout: 15_000,
     });
 
@@ -35,6 +42,7 @@ test.describe('TNS CSI plugin smoke tests', () => {
 
   test('plugin settings page shows TNS CSI plugin entry', async ({ page }) => {
     await page.goto('/settings/plugins');
+    await page.waitForLoadState('networkidle');
 
     const pluginEntry = page.locator('text=/tns.csi/i').first();
     await expect(pluginEntry).toBeVisible({ timeout: 30_000 });