diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tractrac/TracTracEventManagementPanelPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tractrac/TracTracEventManagementPanelPO.java
index 79b2cad3c7c..74e53114dca 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tractrac/TracTracEventManagementPanelPO.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tractrac/TracTracEventManagementPanelPO.java
@@ -246,6 +246,15 @@ public class TracTracEventManagementPanelPO extends PageArea {
         if (!racesToProcess.isEmpty()) {
             throw new IllegalStateException("Not all given races where selected");
         }
+        startTrackingForSelectedRaces(expectedBoatClassErrorOrNull);
+    }
+    
+    public void startTrackingForAllRaces() {
+        getTrackableRacesTable().selectAllEntries();
+        startTrackingForSelectedRaces(null);
+    }
+    
+    private void startTrackingForSelectedRaces(String expectedBoatClassErrorOrNull) {
         this.startTracking();
         if (expectedBoatClassErrorOrNull == null) {
             waitForAjaxRequests();
@@ -253,12 +262,6 @@ public class TracTracEventManagementPanelPO extends PageArea {
             waitForSelectedRacesContainDifferentBoatClassesError(expectedBoatClassErrorOrNull);
         }
     }
-    
-    public void startTrackingForAllRaces() {
-        getTrackableRacesTable().selectAllEntries();
-        startTracking();
-        waitForAjaxRequests();
-    }
 
     private void startTracking() {
         this.startTrackingButton.click();