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 0199be1b4b3d9803ddd840d5fae73d8771678c7b..68c3bd954abcc5ba3ec7382568e812c07ca60ff0 100644
--- a/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
@@ -37,7 +37,7 @@ import org.openqa.selenium.WebElement;
  */
 public class MenuTreePageFragment {
 	
-	private static final By treeBy = By.className("o_tree");
+	public static final By treeBy = By.className("o_tree");
 	
 	private final  WebDriver browser;
 
diff --git a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
index d3d2f75f2dc59cfee8af166fb4cbb78770b60292..7e8372c487b9f6adda598a6b5d29c651a2020c86 100644
--- a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
@@ -124,6 +124,7 @@ public class CoursePageFragment {
 	 * @return
 	 */
 	public MenuTreePageFragment clickTree() {
+		OOGraphene.waitElement(MenuTreePageFragment.treeBy, 2, browser);
 		MenuTreePageFragment menuTree = new MenuTreePageFragment(browser);
 		menuTree.selectRoot();
 		return menuTree;
diff --git a/src/test/java/org/olat/selenium/page/repository/CPPage.java b/src/test/java/org/olat/selenium/page/repository/CPPage.java
index 61bd1eb6cbc8fde223218d284e0acf5d78ed4c13..56ebf8b1f0449eb00b9a4b74206cd3875552837e 100644
--- a/src/test/java/org/olat/selenium/page/repository/CPPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CPPage.java
@@ -46,7 +46,8 @@ public class CPPage {
 	}
 	
 	public CPPage assertInIFrame(By by) {
-		By iframeBy = By.xpath("//iframe");
+		By iframeBy = By.xpath("//div[contains(@class,'o_iframedisplay')]//iframe");
+		OOGraphene.waitElement(iframeBy, 2, browser);
 		List<WebElement> iframes = browser.findElements(iframeBy);
 		browser = browser.switchTo().frame(iframes.get(0));
 		
diff --git a/src/test/java/org/olat/selenium/page/wiki/WikiPage.java b/src/test/java/org/olat/selenium/page/wiki/WikiPage.java
index aff212c345d33fb2dda31369db2104e391400a89..86310d1a1f0d02af1165e717392f77a8ad7dad61 100644
--- a/src/test/java/org/olat/selenium/page/wiki/WikiPage.java
+++ b/src/test/java/org/olat/selenium/page/wiki/WikiPage.java
@@ -67,12 +67,13 @@ public class WikiPage {
 	public WikiPage createPage(String name, String content) {
 		//open the create popover
 		By createBy = By.className("o_sel_wiki_create_page");
+		OOGraphene.waitElement(createBy, 2, browser);
 		WebElement createButton = browser.findElement(createBy);
 		createButton.click();
 		
 		//fill the name of the new page
 		By pageNameBy = By.cssSelector("div.o_callout_content form input[type='text']");
-		OOGraphene.waitElement(pageNameBy, browser);
+		OOGraphene.waitElement(pageNameBy, 2, browser);
 		WebElement pageNameEl = browser.findElement(pageNameBy);
 		pageNameEl.sendKeys(name);
 		//search for it