diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
index 680eb406306902d6c7c2d8dd186a46988c8c24e7..1597dacfb904c02a000d01561550c82f7af4d41b 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
@@ -91,6 +91,8 @@ import {
   BescheidResourceService,
   buildCreateBescheidDocumentFromFileProps,
   buildUpdateBescheidCommandProps,
+  createBescheidListResourceService,
+  createBescheidResourceService,
 } from '@alfa-client/bescheid-shared';
 import { expect } from '@jest/globals';
 import { cold } from 'jest-marbles';
@@ -102,6 +104,8 @@ jest.mock('@alfa-client/bescheid-shared', () => {
   return {
     __esModule: true,
     ...originalModule,
+    createBescheidResourceService: jest.fn(),
+    createBescheidListResourceService: jest.fn(),
     buildUpdateBescheidCommandProps: jest.fn(),
     buildCreateBescheidDocumentFromFileProps: jest.fn(),
   };
@@ -113,12 +117,12 @@ describe('BescheidService', () => {
   let vorgangService: Mock<VorgangService>;
   let resourceRepository: Mock<ResourceRepository>;
   let commandService: Mock<CommandService>;
+  let stateService: Mock<StateService>;
   let vorgangCommandService: Mock<VorgangCommandService>;
   let binaryFileService: Mock<BinaryFileService>;
   let postfachService: Mock<PostfachService>;
   let bescheidResourceService: Mock<BescheidResourceService>;
   let bescheidListResourceService: Mock<BescheidListResourceService>;
-  let stateService: Mock<StateService>;
 
   const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
   const vorgangWithEingangStateResource: StateResource<VorgangWithEingangResource> =
@@ -130,6 +134,7 @@ describe('BescheidService', () => {
     facade = mock(BescheidFacade);
     resourceRepository = mock(ResourceRepository);
     commandService = mock(CommandService);
+    stateService = mock(StateService);
     vorgangCommandService = mock(VorgangCommandService);
     vorgangService = mock(VorgangService);
     vorgangService.getVorgangWithEingang.mockReturnValue(of(vorgangWithEingangStateResource));
@@ -137,7 +142,8 @@ describe('BescheidService', () => {
     postfachService = mock(PostfachService);
     bescheidResourceService = mock(CommandResourceService);
     bescheidListResourceService = mock(CommandListResourceService);
-    stateService = mock(StateService);
+    (createBescheidResourceService as jest.Mock).mockReturnValue(bescheidResourceService);
+    (createBescheidListResourceService as jest.Mock).mockReturnValue(bescheidListResourceService);
 
     TestBed.configureTestingModule({
       providers: [
@@ -145,12 +151,10 @@ describe('BescheidService', () => {
         { provide: VorgangService, useValue: vorgangService },
         { provide: ResourceRepository, useValue: resourceRepository },
         { provide: CommandService, useValue: commandService },
-        { provide: StateService, useValue: stateService },
         { provide: VorgangCommandService, useValue: vorgangCommandService },
         { provide: BinaryFileService, useValue: binaryFileService },
         { provide: PostfachService, useValue: postfachService },
-        { provide: BescheidResourceService, useValue: bescheidResourceService },
-        { provide: BescheidListResourceService, useValue: bescheidListResourceService },
+        { provide: StateService, useValue: stateService },
         BescheidService,
       ],
     });