diff --git a/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts b/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts
index 8003c41..75ce50a 100644
--- a/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts
+++ b/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts
@@ -77,6 +77,9 @@ describe.each(repositoryImplementations)('$name', (holder) => {
       const secondStopArrivalTime = new Date(2025, 0, 1, 12, 15, 0);
       await shuttleRepository.addOrUpdateShuttle(shuttle, secondStopArrivalTime.getTime());
 
+      // Necessary to wait for the event emitter subscriber to execute
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
       const travelTime = await repository.getAverageTravelTimeSeconds({
         routeId: route.id,
         fromStopId: stop1.id,
@@ -92,8 +95,9 @@ describe.each(repositoryImplementations)('$name', (holder) => {
       const { route, systemId, stop1, stop2 } = await setupRouteAndOrderedStops();
 
       const shuttleSecondArrivalTimeAtFirstStop = new Date(2025, 0, 8, 12, 0, 0);
+      const currentTime = new Date(shuttleSecondArrivalTimeAtFirstStop.getTime() + 7 * 60 * 1000);
       // "current time" is 7 minutes past arrival, expected eta = 8 minutes
-      repository.setReferenceTime(new Date(shuttleSecondArrivalTimeAtFirstStop.getTime() + 7 * 60 * 1000));  
+      repository.setReferenceTime(currentTime);  
       repository.startListeningForUpdates();
 
       const shuttle = {
@@ -119,9 +123,17 @@ describe.each(repositoryImplementations)('$name', (holder) => {
         shuttleSecondArrivalTimeAtFirstStop.getTime(),
       );
 
+      shuttle.coordinates = { latitude: 12.5, longitude: 22.5 };
+      await shuttleRepository.addOrUpdateShuttle(
+        shuttle,
+        currentTime.getTime(),
+      );
+
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
       const eta = await repository.getEtaForShuttleAndStopId(shuttle.id, stop2.id);
       expect(eta?.secondsRemaining).toEqual(8 * 60);
-    });
+    }, 60000);
   });
 
   describe("getAverageTravelTimeSeconds", () => {
@@ -147,6 +159,8 @@ describe.each(repositoryImplementations)('$name', (holder) => {
       const secondStopTime = new Date(2025, 0, 1, 12, 15, 0);
       await shuttleRepository.addOrUpdateShuttle(shuttle, secondStopTime.getTime());
 
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
       const travelTime = await repository.getAverageTravelTimeSeconds({
         routeId: route.id,
         fromStopId: stop1.id,