diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
index 5874f250eb5..fff10acdac6 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
@@ -80,9 +80,11 @@ public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest {
         testNumberOfRawFixes(trackedRace.getOrCreateTrack(mark), 1);
         // now extend the tracking interval of the tracked race and assert that the additional fixes are loaded
         trackedRace.setEndOfTrackingReceived(new MillisecondsTimePoint(2500), /* wait for fixes to load */ true);
+        trackedRace.waitForLoadingToFinish();
         testNumberOfRawFixes(trackedRace.getTrack(comp), 2);
         testNumberOfRawFixes(trackedRace.getOrCreateTrack(mark), 2);
         trackedRace.setStartOfTrackingReceived(new MillisecondsTimePoint(0), /* wait for fixes to load */ true);
+        trackedRace.waitForLoadingToFinish();
         testNumberOfRawFixes(trackedRace.getTrack(comp), 3);
         testNumberOfRawFixes(trackedRace.getOrCreateTrack(mark), 3);
     }