diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts
index d7c4107..5c1821d 100644
--- a/test/resolvers/EtaResolverTests.test.ts
+++ b/test/resolvers/EtaResolverTests.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import { ApolloServer } from "@apollo/server";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
-import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
+import { setUpTestServer, setupTestServerContext } from "../testHelpers/apolloSetupHelpers";
 import { ServerContext } from "../../src/ServerContext";
 import { IEta, IShuttle, IStop, ISystem } from "../../src/entities/entities";
 import {
@@ -13,13 +13,7 @@ import { generateMockEtas, generateMockShuttles, generateMockStops } from "../ge
 import assert = require("node:assert");
 
 describe("EtaResolvers", () => {
-  let testServer: ApolloServer<ServerContext>;
-  let repository: UnoptimizedInMemoryRepository;
-
-  beforeEach(async () => {
-    testServer = setUpTestServer();
-    repository = new UnoptimizedInMemoryRepository();
-  });
+  const context = setupTestServerContext();
 
   let mockSystem: ISystem;
   let mockShuttle: IShuttle;
@@ -27,14 +21,14 @@ describe("EtaResolvers", () => {
   let expectedEta: IEta;
 
   beforeEach(async () => {
-    mockSystem = await addMockSystemToRepository(repository);
-    mockShuttle = await addMockShuttleToRepository(repository, mockSystem.id);
-    mockStop = await addMockStopToRepository(repository, mockSystem.id);
-    expectedEta = await addMockEtaToRepository(repository, mockStop.id, mockShuttle.id);
+    mockSystem = await addMockSystemToRepository(context.repository);
+    mockShuttle = await addMockShuttleToRepository(context.repository, mockSystem.id);
+    mockStop = await addMockStopToRepository(context.repository, mockSystem.id);
+    expectedEta = await addMockEtaToRepository(context.repository, mockStop.id, mockShuttle.id);
   });
 
   async function getResponseForEtaQuery(query: string) {
-    const response = await testServer.executeOperation({
+    const response = await context.testServer.executeOperation({
       query,
       variables: {
         systemId: mockSystem.id,
@@ -42,7 +36,7 @@ describe("EtaResolvers", () => {
       },
     }, {
       contextValue: {
-        repository,
+        repository: context.repository,
       }
     });
     return response;