diff --git a/src/test/java/org/olat/selenium/page/course/AssessmentModePage.java b/src/test/java/org/olat/selenium/page/course/AssessmentModePage.java
index 479b43e13a4aea54a8d477a489014c626e5b03d1..a75c6c045e7f0ea67efade3c3b5f66e0f214ab20 100644
--- a/src/test/java/org/olat/selenium/page/course/AssessmentModePage.java
+++ b/src/test/java/org/olat/selenium/page/course/AssessmentModePage.java
@@ -119,14 +119,6 @@ public class AssessmentModePage {
 	 * @return
 	 */
 	public AssessmentModePage confirmStart() {
-		return confirmDialog();
-	}
-	
-	/**
-	 * Confirm a standard yes/no dialog
-	 * @return
-	 */
-	private AssessmentModePage confirmDialog() {
 		By confirmButtonBy = By.cssSelector("div.modal-dialog div.modal-footer a");
 		List<WebElement> buttonsEl = browser.findElements(confirmButtonBy);
 		buttonsEl.get(0).click();
@@ -149,7 +141,11 @@ public class AssessmentModePage {
 	}
 	
 	public AssessmentModePage confirmStop() {
-		return confirmDialog();
+		By confirmButtonBy = By.cssSelector("div.modal-dialog div.modal-body button.btn-primary");
+		OOGraphene.waitElement(confirmButtonBy, browser);
+		browser.findElement(confirmButtonBy).click();
+		OOGraphene.waitBusy(browser);
+		return this;
 	}
 	
 	/**