diff --git a/src/test/java/org/olat/selenium/page/LoginPage.java b/src/test/java/org/olat/selenium/page/LoginPage.java
index ecce3821b4095aba3659e0eaa809d26615e3d8af..e9b0b648275ad37bbbaad63a24d9451eaa85ada2 100644
--- a/src/test/java/org/olat/selenium/page/LoginPage.java
+++ b/src/test/java/org/olat/selenium/page/LoginPage.java
@@ -233,9 +233,9 @@ public class LoginPage {
 	public LoginPage resume() {
 		List<WebElement> resumes = browser.findElements(resumeButton);
 		if(resumes.size() > 0 && resumes.get(0).isDisplayed()) {
-			WebElement resume = resumes.get(0);
-			resume.click();
+			resumes.get(0).click();
 			OOGraphene.waitBusy(browser);
+			OOGraphene.waitModalDialogDisappears(browser);
 		}
 		return this;
 	}
diff --git a/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java b/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
index 281f02cb904a04dcd35f8cfeb27cd75eb588b52a..b92fbfa1de7e768e4c49d7f056c6ab5c104e00c8 100644
--- a/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
@@ -51,7 +51,7 @@ public class MenuTreePageFragment {
 	 * @return The menu page fragment
 	 */
 	public MenuTreePageFragment selectRoot() {
-		By rootNodeBy = By.cssSelector("div.o_tree span.o_tree_link.o_tree_l0>a");
+		By rootNodeBy = By.xpath("//div[contains(@class,'o_tree')]//span[contains(@class,'o_tree_link')][contains(@class,'o_tree_l0')]/a");
 		OOGraphene.waitElement(rootNodeBy, browser);
 		browser.findElement(rootNodeBy).click();
 		OOGraphene.waitBusy(browser);