diff --git a/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts b/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts
index bc946d94..cf279546 100644
--- a/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts
+++ b/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts
@@ -10,9 +10,7 @@ vi.mock('$app/state', () => ({
 	}
 }));
 
-vi.mock('$lib/shared/services/confirm.svelte', () => ({
-	getConfirmService: () => ({ confirm: async () => false })
-}));
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 vi.mock('$app/navigation', () => ({
 	beforeNavigate: () => {},
@@ -49,13 +47,17 @@ const baseData = (overrides: Record<string, unknown> = {}) => ({
 
 describe('admin/tags/[id] page', () => {
 	it('renders the edit heading with the tag name', async () => {
-		render(AdminTagEditPage, { props: { data: baseData(), form: undefined } });
+		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		await expect.element(page.getByRole('heading', { name: /personen/i })).toBeVisible();
 	});
 
 	it('hydrates the name input from data.tag.name', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData({ tag: baseTag({ name: 'Reisen' }) }), form: undefined }
 		});
 
@@ -64,14 +66,20 @@ describe('admin/tags/[id] page', () => {
 	});
 
 	it('renders the color picker for top-level tags (no parentId)', async () => {
-		render(AdminTagEditPage, { props: { data: baseData(), form: undefined } });
+		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		const colorPicker = document.querySelector('[data-testid="color-picker"]');
 		expect(colorPicker).not.toBeNull();
 	});
 
 	it('renders one color swatch per palette entry', async () => {
-		render(AdminTagEditPage, { props: { data: baseData(), form: undefined } });
+		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		const swatches = document.querySelectorAll('[data-testid^="color-swatch-"]');
 		expect(swatches.length).toBeGreaterThanOrEqual(10);
@@ -79,6 +87,7 @@ describe('admin/tags/[id] page', () => {
 
 	it('marks the active color swatch as aria-pressed', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData({ tag: baseTag({ color: 'amber' }) }), form: undefined }
 		});
 
@@ -88,6 +97,7 @@ describe('admin/tags/[id] page', () => {
 
 	it('shows the form-success banner when form.success is true', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData(), form: { success: true } }
 		});
 
@@ -97,6 +107,7 @@ describe('admin/tags/[id] page', () => {
 
 	it('shows the form-error banner when form.error is set', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData(), form: { error: 'Tag name already in use' } }
 		});
 
@@ -106,6 +117,7 @@ describe('admin/tags/[id] page', () => {
 
 	it('shows the merge-success banner when data.mergeSuccess is set', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData({ mergeSuccess: 'old-id' }), form: undefined }
 		});
 
@@ -115,6 +127,7 @@ describe('admin/tags/[id] page', () => {
 
 	it('hides the color picker for child tags (parentId set)', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: {
 				data: baseData({ tag: baseTag({ parentId: 't-parent' }) }),
 				form: undefined
@@ -126,7 +139,10 @@ describe('admin/tags/[id] page', () => {
 	});
 
 	it('does not show form-success banner when form is undefined', async () => {
-		render(AdminTagEditPage, { props: { data: baseData(), form: undefined } });
+		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		const banners = document.querySelectorAll('.bg-green-50');
 		// Some other green elements may exist, but the form-success specifically
@@ -139,6 +155,7 @@ describe('admin/tags/[id] page', () => {
 
 	it('hides the merge-success banner when mergeSuccess is null', async () => {
 		render(AdminTagEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData({ mergeSuccess: null }), form: undefined }
 		});
 
diff --git a/frontend/src/routes/geschichten/[id]/page.svelte.test.ts b/frontend/src/routes/geschichten/[id]/page.svelte.test.ts
index f119f0c3..9bc111c2 100644
--- a/frontend/src/routes/geschichten/[id]/page.svelte.test.ts
+++ b/frontend/src/routes/geschichten/[id]/page.svelte.test.ts
@@ -1,10 +1,8 @@
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { describe, it, expect, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 
-vi.mock('$lib/shared/services/confirm.svelte', () => ({
-	getConfirmService: () => ({ confirm: async () => false })
-}));
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 const { default: GeschichtePage } = await import('./+page.svelte');
 
@@ -33,7 +31,10 @@ const baseData = (overrides: Record<string, unknown> = {}) => ({
 
 describe('geschichten/[id] page', () => {
 	it('renders the geschichte title as the level-1 heading', async () => {
-		render(GeschichtePage, { props: { data: baseData() } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData() }
+		});
 
 		await expect
 			.element(page.getByRole('heading', { level: 1, name: /reise nach berlin/i }))
@@ -41,13 +42,17 @@ describe('geschichten/[id] page', () => {
 	});
 
 	it('renders the author full name from firstName + lastName', async () => {
-		render(GeschichtePage, { props: { data: baseData() } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData() }
+		});
 
 		await expect.element(page.getByText(/Anna Schmidt/)).toBeVisible();
 	});
 
 	it('falls back to author email when no name is set', async () => {
 		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: {
 				data: baseData({
 					geschichte: baseGeschichte({
@@ -62,6 +67,7 @@ describe('geschichten/[id] page', () => {
 
 	it('renders an empty author when author is null', async () => {
 		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData({ geschichte: baseGeschichte({ author: null }) }) }
 		});
 
@@ -69,13 +75,17 @@ describe('geschichten/[id] page', () => {
 	});
 
 	it('renders the publishedAt date suffix when publishedAt is set', async () => {
-		render(GeschichtePage, { props: { data: baseData() } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData() }
+		});
 
 		await expect.element(page.getByText(/veröffentlicht am/i)).toBeVisible();
 	});
 
 	it('omits the publishedAt suffix when publishedAt is null', async () => {
 		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData({ geschichte: baseGeschichte({ publishedAt: null }) }) }
 		});
 
@@ -83,13 +93,17 @@ describe('geschichten/[id] page', () => {
 	});
 
 	it('omits the persons section when there are no linked persons', async () => {
-		render(GeschichtePage, { props: { data: baseData() } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData() }
+		});
 
 		await expect.element(page.getByText(/Personen in dieser Geschichte/i)).not.toBeInTheDocument();
 	});
 
 	it('renders the persons section when there are linked persons', async () => {
 		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: {
 				data: baseData({
 					geschichte: baseGeschichte({
@@ -108,13 +122,17 @@ describe('geschichten/[id] page', () => {
 	});
 
 	it('omits the documents section when there are no linked documents', async () => {
-		render(GeschichtePage, { props: { data: baseData() } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData() }
+		});
 
 		await expect.element(page.getByText('Erwähnte Dokumente')).not.toBeInTheDocument();
 	});
 
 	it('renders the documents section when there are linked documents', async () => {
 		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: {
 				data: baseData({
 					geschichte: baseGeschichte({
@@ -129,7 +147,10 @@ describe('geschichten/[id] page', () => {
 	});
 
 	it('renders edit and delete actions when canBlogWrite is true', async () => {
-		render(GeschichtePage, { props: { data: baseData({ canBlogWrite: true }) } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData({ canBlogWrite: true }) }
+		});
 
 		await expect
 			.element(page.getByRole('link', { name: /bearbeiten/i }))
@@ -138,7 +159,10 @@ describe('geschichten/[id] page', () => {
 	});
 
 	it('hides edit and delete actions when canBlogWrite is false', async () => {
-		render(GeschichtePage, { props: { data: baseData({ canBlogWrite: false }) } });
+		render(GeschichtePage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData({ canBlogWrite: false }) }
+		});
 
 		await expect.element(page.getByRole('link', { name: /bearbeiten/i })).not.toBeInTheDocument();
 		await expect.element(page.getByRole('button', { name: /löschen/i })).not.toBeInTheDocument();
diff --git a/frontend/src/routes/persons/[id]/edit/page.svelte.test.ts b/frontend/src/routes/persons/[id]/edit/page.svelte.test.ts
index e7dc990d..b7f36645 100644
--- a/frontend/src/routes/persons/[id]/edit/page.svelte.test.ts
+++ b/frontend/src/routes/persons/[id]/edit/page.svelte.test.ts
@@ -1,10 +1,8 @@
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { describe, it, expect, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 
-vi.mock('$lib/shared/services/confirm.svelte', () => ({
-	getConfirmService: () => ({ confirm: async () => false })
-}));
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 const { default: PersonEditPage } = await import('./+page.svelte');
 
@@ -29,19 +27,26 @@ const baseData = (overrides: Record<string, unknown> = {}) => ({
 
 describe('persons/[id]/edit page', () => {
 	it('renders the edit heading', async () => {
-		render(PersonEditPage, { props: { data: baseData(), form: undefined } });
+		render(PersonEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		await expect.element(page.getByRole('heading', { name: /person bearbeiten/i })).toBeVisible();
 	});
 
 	it('renders the persons-section heading', async () => {
-		render(PersonEditPage, { props: { data: baseData(), form: undefined } });
+		render(PersonEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		await expect.element(page.getByRole('heading', { name: /angaben zur person/i })).toBeVisible();
 	});
 
 	it('shows the form-error banner when form.updateError is set', async () => {
 		render(PersonEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
 			props: { data: baseData(), form: { updateError: 'Last name is required' } }
 		});
 
@@ -49,14 +54,20 @@ describe('persons/[id]/edit page', () => {
 	});
 
 	it('does not show the form-error banner when form is undefined', async () => {
-		render(PersonEditPage, { props: { data: baseData(), form: undefined } });
+		render(PersonEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		const banner = document.querySelector('.bg-red-50.border-red-200');
 		expect(banner).toBeNull();
 	});
 
 	it('renders the save bar with the discard href pointing to the person detail', async () => {
-		render(PersonEditPage, { props: { data: baseData(), form: undefined } });
+		render(PersonEditPage, {
+			context: new Map([[CONFIRM_KEY, createConfirmService()]]),
+			props: { data: baseData(), form: undefined }
+		});
 
 		const link = document.querySelector('a[href="/persons/p-1"]');
 		expect(link).not.toBeNull();