diff --git a/test/resolvers/OrderedStopResolverTests.test.ts b/test/resolvers/OrderedStopResolverTests.test.ts
index b9602f0..d26f7bc 100644
--- a/test/resolvers/OrderedStopResolverTests.test.ts
+++ b/test/resolvers/OrderedStopResolverTests.test.ts
@@ -12,6 +12,7 @@ import {
   generateMockSystems
 } from "../generators";
 import assert = require("node:assert");
+import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
 describe("OrderedStopResolvers", () => {
   let testServer: ApolloServer<ServerContext>;
@@ -27,10 +28,7 @@ describe("OrderedStopResolvers", () => {
   let mockStops: IStop[];
 
   beforeEach(async () => {
-    const mockSystems = generateMockSystems();
-    mockSystem = mockSystems[0];
-    mockSystem.id = "1";
-    await repository.addOrUpdateSystem(mockSystem);
+    mockSystem = await addMockSystemToRepository(repository);
 
     const mockRoutes = generateMockRoutes();
     mockRoute = mockRoutes[0];
diff --git a/test/resolvers/StopResolverTests.test.ts b/test/resolvers/StopResolverTests.test.ts
index c7a23b3..392fd24 100644
--- a/test/resolvers/StopResolverTests.test.ts
+++ b/test/resolvers/StopResolverTests.test.ts
@@ -6,6 +6,7 @@ import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { generateMockEtas, generateMockOrderedStops, generateMockStops, generateMockSystems } from "../generators";
 import { IStop, ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
+import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
 describe("StopResolvers", () => {
   let testServer: ApolloServer<ServerContext>;
@@ -20,10 +21,7 @@ describe("StopResolvers", () => {
   let mockSystem: ISystem;
 
   beforeEach(async () => {
-    const mockSystems = generateMockSystems();
-    mockSystem = mockSystems[0];
-    mockSystem.id = "1";
-    await repository.addOrUpdateSystem(mockSystem);
+    mockSystem = await addMockSystemToRepository(repository);
 
     const mockStops = generateMockStops();
     mockStop = mockStops[0];