diff --git a/frontend/src/components/dialogs/__tests__/CertificateDetailDialog.test.tsx b/frontend/src/components/dialogs/__tests__/CertificateDetailDialog.test.tsx
index c2ced156..f1570a38 100644
--- a/frontend/src/components/dialogs/__tests__/CertificateDetailDialog.test.tsx
+++ b/frontend/src/components/dialogs/__tests__/CertificateDetailDialog.test.tsx
@@ -104,7 +104,7 @@ describe('CertificateDetailDialog', () => {
 
   it('displays common name', () => {
     renderDialog()
-    const matches = screen.getAllByText(/app\.example\.com/)
+    const matches = screen.getAllByText(/^app\.example\.com$/)
     expect(matches.length).toBeGreaterThanOrEqual(1)
   })
 
@@ -161,6 +161,7 @@ describe('CertificateDetailDialog', () => {
     vi.mocked(useCertificateDetail).mockReturnValue({
       detail: undefined as unknown as CertificateDetail,
       isLoading: true,
+      error: null,
     })
     renderDialog()
     expect(screen.getByTestId('certificate-detail-dialog')).toBeTruthy()
@@ -189,6 +190,7 @@ describe('CertificateDetailDialog', () => {
     vi.mocked(useCertificateDetail).mockReturnValue({
       detail: sparseDetail,
       isLoading: false,
+      error: null,
     })
     renderDialog()
     const dashes = screen.getAllByText('-')
@@ -204,6 +206,7 @@ describe('CertificateDetailDialog', () => {
     vi.mocked(useCertificateDetail).mockReturnValue({
       detail: noHostDetail,
       isLoading: false,
+      error: null,
     })
     renderDialog()
     expect(screen.getByText('certificates.noAssignedHosts')).toBeTruthy()
@@ -217,6 +220,7 @@ describe('CertificateDetailDialog', () => {
     vi.mocked(useCertificateDetail).mockReturnValue({
       detail: autoRenewDetail,
       isLoading: false,
+      error: null,
     })
     renderDialog()
     expect(screen.getByText('common.yes')).toBeTruthy()
@@ -231,6 +235,7 @@ describe('CertificateDetailDialog', () => {
     vi.mocked(useCertificateDetail).mockReturnValue({
       detail: noOrgDetail,
       isLoading: false,
+      error: null,
     })
     renderDialog()
     expect(screen.getByText('Fallback Issuer')).toBeTruthy()
@@ -240,6 +245,7 @@ describe('CertificateDetailDialog', () => {
     vi.mocked(useCertificateDetail).mockReturnValue({
       detail: undefined as unknown as CertificateDetail,
       isLoading: false,
+      error: null,
     })
     renderDialog(null)
     expect(screen.queryByText('My Cert')).toBeFalsy()
diff --git a/frontend/src/components/dialogs/__tests__/CertificateExportDialog.test.tsx b/frontend/src/components/dialogs/__tests__/CertificateExportDialog.test.tsx
index dc6b140a..76a0107f 100644
--- a/frontend/src/components/dialogs/__tests__/CertificateExportDialog.test.tsx
+++ b/frontend/src/components/dialogs/__tests__/CertificateExportDialog.test.tsx
@@ -175,8 +175,8 @@ describe('CertificateExportDialog', () => {
     const fakeBlob = new Blob(['cert-data'], { type: 'application/x-pem-file' })
     const revokeURL = vi.fn()
     const createURL = vi.fn(() => 'blob:http://localhost/fake')
-    global.URL.createObjectURL = createURL
-    global.URL.revokeObjectURL = revokeURL
+    globalThis.URL.createObjectURL = createURL
+    globalThis.URL.revokeObjectURL = revokeURL
 
     const appendSpy = vi.spyOn(document.body, 'appendChild')
     const removeSpy = vi.fn()
@@ -251,8 +251,8 @@ describe('CertificateExportDialog', () => {
 
   it('uses certificate name in download filename on success', async () => {
     const fakeBlob = new Blob(['data'])
-    global.URL.createObjectURL = vi.fn(() => 'blob:fake')
-    global.URL.revokeObjectURL = vi.fn()
+    globalThis.URL.createObjectURL = vi.fn(() => 'blob:fake')
+    globalThis.URL.revokeObjectURL = vi.fn()
 
     let capturedAnchor: HTMLAnchorElement | null = null
     exportMutateFn.mockImplementation(