diff --git a/test/resolvers/SystemResolverTests.test.ts b/test/resolvers/SystemResolverTests.test.ts
index 8990bf8..4fac792 100644
--- a/test/resolvers/SystemResolverTests.test.ts
+++ b/test/resolvers/SystemResolverTests.test.ts
@@ -4,7 +4,7 @@ import { ServerContext } from "../../src/ServerContext";
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../generators";
-import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 import { ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
 
@@ -94,27 +94,69 @@ describe("SystemResolvers", () => {
   });
 
   describe("stop", () => {
-    const query = `
-    query GetSystemStop($systemId: ID!, $stopId: ID!) {
-      system(id: $systemId) {
-        stop(id: $stopId) {
-          id
-          name
+    async function getResponseForStopQuery(stopId: string) {
+      const query = `
+      query GetSystemStop($systemId: ID!, $stopId: ID!) {
+        system(id: $systemId) {
+          stop(id: $stopId) {
+            id
+            name
+          }
         }
       }
+      `;
+
+      return await testServer.executeOperation({
+        query,
+        variables: {
+          systemId: mockSystem.id,
+          stopId: stopId,
+        },
+      }, {
+        contextValue: {
+          repository,
+        }
+      });
     }
-    `;
 
     it("gets the stop with the correct id", async () => {
+      const mockStop = await addMockStopToRepository(repository, mockSystem.id);
 
+      const response = await getResponseForStopQuery(mockStop.id);
+
+      assert(response.body.kind === "single");
+      expect(response.body.singleResult.errors).toBeUndefined();
+      const stop = (response.body.singleResult.data as any).system.stop;
+      expect(stop.id).toEqual(mockStop.id);
+      expect(stop.name).toEqual(mockStop.name);
     });
 
     it("returns null if the stop isn't associated with the system", async () => {
+      const updatedSystem = {
+        ...mockSystem,
+        id: "2",
+      }
+      await repository.addOrUpdateSystem(updatedSystem);
 
+      const mockStop = await addMockStopToRepository(repository, updatedSystem.id);
+
+      const response = await getResponseForStopQuery(mockStop.id);
+
+      assert(response.body.kind === "single");
+      expect(response.body.singleResult.errors).toBeUndefined();
+
+      const stop = (response.body.singleResult.data as any).system.stop;
+      expect(stop).toBeNull();
     });
 
     it("returns null if there is no stop", async () => {
+      const response = await getResponseForStopQuery("1");
 
+      assert(response.body.kind === "single");
+      expect(response.body.singleResult.errors).toBeUndefined();
+
+      const stop = (response.body.singleResult.data as any).system.stop;
+      expect(stop).toBeNull();
     });
   });