diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts
index 440da68..49aeb29 100644
--- a/test/resolvers/EtaResolverTests.test.ts
+++ b/test/resolvers/EtaResolverTests.test.ts
@@ -3,6 +3,8 @@ import { ApolloServer } from "@apollo/server";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { ServerContext } from "../../src/ServerContext";
+import { ISystem } from "../../src/entities/entities";
+import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
 describe("EtaResolvers", () => {
   let testServer: ApolloServer<ServerContext>;
@@ -13,6 +15,12 @@ describe("EtaResolvers", () => {
     repository = new UnoptimizedInMemoryRepository();
   });
 
+  let mockSystem: ISystem;
+
+  beforeEach(async () => {
+    mockSystem = await addMockSystemToRepository(repository);
+  })
+
   describe("stop", () => {
     const query = `
     query GetETAStop($systemId: ID!, $shuttleId: ID!) {
diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/test/resolvers/ShuttleResolverTests.test.ts
index 8ee996c..95bd8a5 100644
--- a/test/resolvers/ShuttleResolverTests.test.ts
+++ b/test/resolvers/ShuttleResolverTests.test.ts
@@ -6,14 +6,8 @@ import { generateMockEtas, generateMockRoutes, generateMockShuttles, generateMoc
 import { IShuttle, ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
+import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
-async function addMockSystemToRepository(mockSystem: ISystem, repository: UnoptimizedInMemoryRepository) {
-  const mockSystems = generateMockSystems();
-  mockSystem = mockSystems[0];
-  mockSystem.id = "1";
-  await repository.addOrUpdateSystem(mockSystem);
-  return mockSystem;
-}
 
 describe("ShuttleResolvers", () => {
   let testServer: ApolloServer<ServerContext>
@@ -28,7 +22,7 @@ describe("ShuttleResolvers", () => {
   let mockShuttle: IShuttle;
 
   beforeEach(async () => {
-    mockSystem = await addMockSystemToRepository(mockSystem, repository);
+    mockSystem = await addMockSystemToRepository(repository);
 
     const mockShuttles = generateMockShuttles();
     mockShuttle = mockShuttles[0];
diff --git a/test/testHelpers/repositorySetupHelpers.ts b/test/testHelpers/repositorySetupHelpers.ts
new file mode 100644
index 0000000..65175be
--- /dev/null
+++ b/test/testHelpers/repositorySetupHelpers.ts
@@ -0,0 +1,12 @@
+import { ISystem } from "../../src/entities/entities";
+import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
+import { generateMockSystems } from "../generators";
+
+export async function addMockSystemToRepository(repository: UnoptimizedInMemoryRepository) {
+  const mockSystems = generateMockSystems();
+  const mockSystem = mockSystems[0];
+  mockSystem.id = "1";
+  await repository.addOrUpdateSystem(mockSystem);
+
+  return mockSystem;
+}