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 c99911f6f6c3793da67a41842006e1b4346878f6..aa3fb84797e7713930b87cde0a7e34268937f14b 100644
--- a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
@@ -190,6 +190,8 @@ public class CoursePageFragment {
 		browser.findElement(editCourseBy).click();
 		OOGraphene.waitBusy(browser);
 		OOGraphene.closeBlueMessageWindow(browser);
+		By dropdownModifyNodeBy = By.cssSelector("a.o_sel_course_editor_change_node");
+		OOGraphene.waitElement(dropdownModifyNodeBy, 5, browser);
 		return new CourseEditorPageFragment(browser);
 	}
 	
diff --git a/src/test/java/org/olat/selenium/page/group/GroupPage.java b/src/test/java/org/olat/selenium/page/group/GroupPage.java
index 275184c5cee1da0a45eda9d1186f81a4b23b498e..f162b4c21bfdd10544c1fd91adcf86516ffc9303 100644
--- a/src/test/java/org/olat/selenium/page/group/GroupPage.java
+++ b/src/test/java/org/olat/selenium/page/group/GroupPage.java
@@ -292,7 +292,7 @@ public class GroupPage {
 	}
 	
 	public GroupPage assertOnInfosPage(String name) {
-		By groupNameBy = By.xpath("//div[@id='o_main_center_content_inner']//p[contains(text(),'" + name+ "')]");
+		By groupNameBy = By.xpath("//div[@id='o_main_center_content_inner']//div[contains(@class,'o_name')]//div[contains(text(),'" + name + "')]");
 		List<WebElement> groupNameEls = browser.findElements(groupNameBy);
 		Assert.assertFalse(groupNameEls.isEmpty());
 		return this;
diff --git a/src/test/java/org/olat/selenium/page/group/GroupsPage.java b/src/test/java/org/olat/selenium/page/group/GroupsPage.java
index 8811d6cf8c2a8c477ef05423ea40318fbabddc63..80940afef7ef70db05dc9509317ad3613eea2932 100644
--- a/src/test/java/org/olat/selenium/page/group/GroupsPage.java
+++ b/src/test/java/org/olat/selenium/page/group/GroupsPage.java
@@ -61,6 +61,7 @@ public class GroupsPage {
 		WebElement createButton = browser.findElement(createBy);
 		createButton.click();
 		OOGraphene.waitBusy(browser);
+		OOGraphene.waitModalDialog(browser);
 		By popupBy = By.cssSelector("div.modal-content fieldset.o_sel_group_edit_group_form");
 		OOGraphene.waitElement(popupBy, 5, browser);
 		
@@ -75,7 +76,7 @@ public class GroupsPage {
 		WebElement submitButton = browser.findElement(submitBy);
 		submitButton.click();
 		OOGraphene.waitBusy(browser);
-		By groupNameBy = By.xpath("//div[@id='o_main_center_content_inner']//p[contains(text(),'" + name+ "')]");
+		By groupNameBy = By.xpath("//div[@id='o_main_center_content_inner']//div[contains(@class,'o_name')]//div[contains(text(),'" + name+ "')]");
 		OOGraphene.waitElement(groupNameBy, 2, browser);
 		
 		return new GroupPage(browser);
@@ -118,11 +119,8 @@ public class GroupsPage {
 	 */
 	public GroupPage selectGroup(String name) {
 		selectGroupInTable(name);
-		
-		//By groupNameBy = By.xpath("//div[contains(@class,'o_tree')]//a/span[contains(text(),'" + name+ "')]");
-		By groupNameBy = By.xpath("//div[@id='o_main_center_content_inner']//p[contains(text(),'" + name+ "')]");
+		By groupNameBy = By.xpath("//div[@id='o_main_center_content_inner']//div[contains(@class,'o_name')]//div[contains(text(),'" + name+ "')]");
 		OOGraphene.waitElement(groupNameBy, browser);
-		
 		return new GroupPage(browser);
 	}