diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts
index 7986a87..daf5fef 100644
--- a/test/resolvers/EtaResolverTests.test.ts
+++ b/test/resolvers/EtaResolverTests.test.ts
@@ -48,15 +48,13 @@ describe("EtaResolvers", () => {
       const stops = generateMockStops();
       const stop = stops[0];
       stop.systemId = mockSystem.id;
+      await repository.addOrUpdateStop(stop);
 
       const etas = generateMockEtas();
-      await Promise.all(etas.map(async (eta) => {
-        eta.stopId = stop.id;
-        await repository.addOrUpdateEta(eta);
-      }));
       const expectedEta = etas[0];
-
-      await repository.addOrUpdateStop(stop);
+      expectedEta.stopId = stop.id;
+      expectedEta.shuttleId = mockShuttle.id;
+      await repository.addOrUpdateEta(expectedEta);
 
       const response = await testServer.executeOperation({
         query,