diff --git a/web/src/pages/AgentFleetPage.test.tsx b/web/src/pages/AgentFleetPage.test.tsx
index 48bfcb8..a2a4c99 100644
--- a/web/src/pages/AgentFleetPage.test.tsx
+++ b/web/src/pages/AgentFleetPage.test.tsx
@@ -54,7 +54,7 @@ describe('AgentFleetPage — render + XSS hardening (M-026 / M-029 Pass 3)', ()
     vi.mocked(client.getAgents).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderWithQuery(<AgentFleetPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Agent/i)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: /Agent Fleet Overview/i })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/AuditPage.test.tsx b/web/src/pages/AuditPage.test.tsx
index 26fb5da..e2653ee 100644
--- a/web/src/pages/AuditPage.test.tsx
+++ b/web/src/pages/AuditPage.test.tsx
@@ -63,7 +63,7 @@ describe('AuditPage — render + XSS hardening (M-026 / M-029 Pass 3)', () => {
     vi.mocked(client.getAuditEvents).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderWithQuery(<AuditPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Audit/)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Audit Trail' })).toBeInTheDocument();
     });
   });
 
@@ -77,7 +77,7 @@ describe('AuditPage — render + XSS hardening (M-026 / M-029 Pass 3)', () => {
 
     renderWithQuery(<AuditPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Audit/)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Audit Trail' })).toBeInTheDocument();
     });
 
     const liveScripts = document.querySelectorAll('script[data-xss="audit"]');
diff --git a/web/src/pages/CertificateDetailPage.test.tsx b/web/src/pages/CertificateDetailPage.test.tsx
index 175663f..0d53a3f 100644
--- a/web/src/pages/CertificateDetailPage.test.tsx
+++ b/web/src/pages/CertificateDetailPage.test.tsx
@@ -96,7 +96,7 @@ describe('CertificateDetailPage — render + XSS hardening (M-026 / M-029 Pass 3
     vi.mocked(client.getCertificate).mockResolvedValue({ ...xssCert, common_name: 'plain.example.com' } as never);
     renderRoute(<CertificateDetailPage />);
     await waitFor(() => {
-      expect(screen.getByText('plain.example.com')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'plain.example.com' })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/DigestPage.test.tsx b/web/src/pages/DigestPage.test.tsx
index fe2f2fb..8a3145b 100644
--- a/web/src/pages/DigestPage.test.tsx
+++ b/web/src/pages/DigestPage.test.tsx
@@ -52,7 +52,7 @@ describe('DigestPage — render + XSS hardening (M-026 / M-029 Pass 3)', () => {
     vi.mocked(client.previewDigest).mockResolvedValue('<p>Today 5 certs expire</p>' as never);
     renderWithQuery(<DigestPage />);
     await waitFor(() => {
-      expect(screen.getByText('Certificate Digest')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Certificate Digest' })).toBeInTheDocument();
     });
   });
 
@@ -65,7 +65,7 @@ describe('DigestPage — render + XSS hardening (M-026 / M-029 Pass 3)', () => {
       // Wait for the preview surface to render (the page settles into
       // either the preview pane or an error pane — either way the
       // page-load cycle is done by the time the header text appears).
-      expect(screen.getByText('Certificate Digest')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Certificate Digest' })).toBeInTheDocument();
     });
 
     // No live script with our marker may be attached to the DOM, AND no
@@ -82,7 +82,7 @@ describe('DigestPage — render + XSS hardening (M-026 / M-029 Pass 3)', () => {
     vi.mocked(client.previewDigest).mockRejectedValue(new Error('preview failed') as never);
     renderWithQuery(<DigestPage />);
     await waitFor(() => {
-      expect(screen.getByText('Certificate Digest')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Certificate Digest' })).toBeInTheDocument();
     });
   });
 });
diff --git a/web/src/pages/HealthMonitorPage.test.tsx b/web/src/pages/HealthMonitorPage.test.tsx
index 0eba7bf..ef0f07b 100644
--- a/web/src/pages/HealthMonitorPage.test.tsx
+++ b/web/src/pages/HealthMonitorPage.test.tsx
@@ -55,7 +55,7 @@ describe('HealthMonitorPage — render + XSS hardening (M-026 / M-029 Pass 3)',
     vi.mocked(client.listHealthChecks).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 100 } as never);
     renderWithQuery(<HealthMonitorPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Health/i)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: /Health Monitor/i })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/IssuerDetailPage.test.tsx b/web/src/pages/IssuerDetailPage.test.tsx
index f2c787d..67ba59a 100644
--- a/web/src/pages/IssuerDetailPage.test.tsx
+++ b/web/src/pages/IssuerDetailPage.test.tsx
@@ -62,7 +62,7 @@ describe('IssuerDetailPage — render + XSS hardening (M-026 / M-029 Pass 3)', (
     vi.mocked(client.getCertificates).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderRoute(<IssuerDetailPage />);
     await waitFor(() => {
-      expect(screen.getByText('Plain Name')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Plain Name' })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/JobDetailPage.test.tsx b/web/src/pages/JobDetailPage.test.tsx
index f37755f..427ace8 100644
--- a/web/src/pages/JobDetailPage.test.tsx
+++ b/web/src/pages/JobDetailPage.test.tsx
@@ -65,7 +65,7 @@ describe('JobDetailPage — render + XSS hardening (M-026 / M-029 Pass 3)', () =
     vi.mocked(client.getAuditEvents).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 10 } as never);
     renderRoute(<JobDetailPage />);
     await waitFor(() => {
-      expect(screen.getByText(/j-xss-001/)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: /j-xss-001/ })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/JobsPage.test.tsx b/web/src/pages/JobsPage.test.tsx
index 4925cd1..159a4bb 100644
--- a/web/src/pages/JobsPage.test.tsx
+++ b/web/src/pages/JobsPage.test.tsx
@@ -54,7 +54,7 @@ describe('JobsPage — render + XSS hardening (M-026 / M-029 Pass 3)', () => {
     vi.mocked(client.getJobs).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderWithQuery(<JobsPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Jobs/i)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Jobs' })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/NetworkScanPage.test.tsx b/web/src/pages/NetworkScanPage.test.tsx
index 4694463..2eb9d8a 100644
--- a/web/src/pages/NetworkScanPage.test.tsx
+++ b/web/src/pages/NetworkScanPage.test.tsx
@@ -39,7 +39,7 @@ const xssScanTarget = {
   id: 'ns-xss-001',
   name: xssPayload,
   network_range: xssPayload,
-  ports: '443,8443',
+  ports: [443, 8443],
   agent_id: xssPayload,
   enabled: true,
   last_scan_at: new Date().toISOString(),
@@ -58,7 +58,7 @@ describe('NetworkScanPage — render + XSS hardening (M-026 / M-029 Pass 3)', ()
     vi.mocked(client.getNetworkScanTargets).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderWithQuery(<NetworkScanPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Network/i)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Network Scanning' })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/ObservabilityPage.test.tsx b/web/src/pages/ObservabilityPage.test.tsx
index d93f756..acede75 100644
--- a/web/src/pages/ObservabilityPage.test.tsx
+++ b/web/src/pages/ObservabilityPage.test.tsx
@@ -70,7 +70,7 @@ describe('ObservabilityPage — render + XSS hardening (M-026 / M-029 Pass 3)',
 
     renderWithQuery(<ObservabilityPage />);
     await waitFor(() => {
-      expect(screen.getByText('Observability')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Observability' })).toBeInTheDocument();
     });
   });
 
@@ -94,7 +94,7 @@ describe('ObservabilityPage — render + XSS hardening (M-026 / M-029 Pass 3)',
 
     renderWithQuery(<ObservabilityPage />);
     await waitFor(() => {
-      expect(screen.getByText('Observability')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Observability' })).toBeInTheDocument();
     });
 
     const liveScripts = document.querySelectorAll('script[data-xss="observability"]');
diff --git a/web/src/pages/ProfilesPage.test.tsx b/web/src/pages/ProfilesPage.test.tsx
index a67e8d6..0fa7c6c 100644
--- a/web/src/pages/ProfilesPage.test.tsx
+++ b/web/src/pages/ProfilesPage.test.tsx
@@ -55,7 +55,7 @@ describe('ProfilesPage — render + XSS hardening (M-026 / M-029 Pass 3)', () =>
     vi.mocked(client.getProfiles).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderWithQuery(<ProfilesPage />);
     await waitFor(() => {
-      expect(screen.getByText(/Profile/i)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: /Certificate Profiles/i })).toBeInTheDocument();
     });
   });
 
diff --git a/web/src/pages/ShortLivedPage.test.tsx b/web/src/pages/ShortLivedPage.test.tsx
index 966c4ee..7262bef 100644
--- a/web/src/pages/ShortLivedPage.test.tsx
+++ b/web/src/pages/ShortLivedPage.test.tsx
@@ -66,7 +66,7 @@ describe('ShortLivedPage — render + XSS hardening (M-026 / M-029 Pass 3)', ()
     vi.mocked(client.getProfiles).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderWithQuery(<ShortLivedPage />);
     await waitFor(() => {
-      expect(screen.getByText('Short-Lived Credentials')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Short-Lived Credentials' })).toBeInTheDocument();
     });
   });
 
@@ -86,7 +86,7 @@ describe('ShortLivedPage — render + XSS hardening (M-026 / M-029 Pass 3)', ()
 
     renderWithQuery(<ShortLivedPage />);
     await waitFor(() => {
-      expect(screen.getByText('Short-Lived Credentials')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Short-Lived Credentials' })).toBeInTheDocument();
     });
 
     const liveScripts = document.querySelectorAll('script[data-xss="shortlived"]');
diff --git a/web/src/pages/TargetDetailPage.test.tsx b/web/src/pages/TargetDetailPage.test.tsx
index 24643a2..e4f8b71 100644
--- a/web/src/pages/TargetDetailPage.test.tsx
+++ b/web/src/pages/TargetDetailPage.test.tsx
@@ -63,7 +63,7 @@ describe('TargetDetailPage — render + XSS hardening (M-026 / M-029 Pass 3)', (
     vi.mocked(client.getJobs).mockResolvedValue({ data: [], total: 0, page: 1, per_page: 50 } as never);
     renderRoute(<TargetDetailPage />);
     await waitFor(() => {
-      expect(screen.getByText('Plain Name')).toBeInTheDocument();
+      expect(screen.getByRole('heading', { level: 2, name: 'Plain Name' })).toBeInTheDocument();
     });
   });