diff --git a/test/resolvers/OrderedStopResolverTests.test.ts b/test/resolvers/OrderedStopResolverTests.test.ts
index 073e582..e031aca 100644
--- a/test/resolvers/OrderedStopResolverTests.test.ts
+++ b/test/resolvers/OrderedStopResolverTests.test.ts
@@ -44,6 +44,25 @@ describe("OrderedStopResolvers", () => {
     }));
   });
 
+  async function setUpOrderedStopsInRepository() {
+    const orderedStops = generateMockOrderedStops();
+
+    // Set up IDs and link stops together to work with the test query
+    orderedStops[0].routeId = mockRoute.id;
+    orderedStops[1].routeId = mockRoute.id;
+
+    // Ensure that there is no duplication
+    orderedStops[0].stopId = mockStops[0].id;
+    orderedStops[1].stopId = mockStops[1].id;
+
+    // Link the stops together
+    orderedStops[0].nextStop = orderedStops[1];
+    orderedStops[1].previousStop = orderedStops[0];
+    await repository.addOrUpdateOrderedStop(orderedStops[0]);
+    await repository.addOrUpdateOrderedStop(orderedStops[1]);
+    return orderedStops;
+  }
+
   describe("nextStop", () => {
     const query = `
     query GetNextStop($systemId: ID!, $routeId: ID!, $stopId: ID!) {
@@ -62,21 +81,7 @@ describe("OrderedStopResolvers", () => {
 
     it("returns the next stop if it exists", async () => {
       // Arrange
-      const orderedStops = generateMockOrderedStops();
-
-      // Set up IDs and link stops together to work with the test query
-      orderedStops[0].routeId = mockRoute.id;
-      orderedStops[1].routeId = mockRoute.id;
-
-      // Ensure that there is no duplication
-      orderedStops[0].stopId = mockStops[0].id;
-      orderedStops[1].stopId = mockStops[1].id;
-
-      // Link the stops together
-      orderedStops[0].nextStop = orderedStops[1];
-      orderedStops[1].previousStop = orderedStops[0];
-      await repository.addOrUpdateOrderedStop(orderedStops[0]);
-      await repository.addOrUpdateOrderedStop(orderedStops[1]);
+      const orderedStops = await setUpOrderedStopsInRepository();
 
       // Act
       const response = await testServer.executeOperation({