diff --git a/src/main/java/org/olat/commons/memberlist/ui/_content/members.html b/src/main/java/org/olat/commons/memberlist/ui/_content/members.html
index bd5e933e8a1efd98187a949ed2ba8cd87c7446af..a89734bbdc7f9681f72bde9e84b87d1b2e3895b0 100644
--- a/src/main/java/org/olat/commons/memberlist/ui/_content/members.html
+++ b/src/main/java/org/olat/commons/memberlist/ui/_content/members.html
@@ -10,21 +10,21 @@
 #end
 </div>
 
-<div class="o_cmembers o_owners">
+<div class="o_cmembers">
 	#if($showOwners && $hasOwners)
-	<div class="clearfix">
+	<div class="clearfix o_owners o_sel_owners">
 		<h4>$r.translate("members.owners")</h4>
 		$r.render("owners")
 	</div>
 	#end
 	#if($showCoaches && $hasCoaches)
-	<div class="clearfix o_block o_coaches">
+	<div class="clearfix o_block o_coaches o_sel_coaches">
 		<h4>$r.translate("members.coaches")</h4>
 		$r.render("coaches")
 	</div>
 	#end
 	#if($showParticipants)
-		<div class="clearfix o_block o_participants">
+		<div class="clearfix o_block o_participants o_sel_participants">
 			<h4>$r.translate("members.participants")</h4>
 			#if($hasParticipants)
 				$r.render("participants")
@@ -34,7 +34,7 @@
 		</div>
 	#end
 	#if($showWaiting && $hasWaiting)
-	<div class="clearfix o_block o_participants">
+	<div class="clearfix o_block o_participants o_sel_waiting_list">
 		<h4>$r.translate("members.waiting")</h4>
 		$r.render("waiting")
 	</div>
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 29356ff08392544046403abcef63a8ae9a159a5f..d1f4c08d5c2646008ee2f053a1506d9bddb9a0e6 100644
--- a/src/test/java/org/olat/selenium/page/group/GroupPage.java
+++ b/src/test/java/org/olat/selenium/page/group/GroupPage.java
@@ -326,22 +326,22 @@ public class GroupPage {
 	}
 	
 	public GroupPage assertParticipantList() {
-		By participantListBy = By.id("o_sel_group_participants");
+		By participantListBy = By.className("o_sel_participants");
 		List<WebElement> participantListEl = browser.findElements(participantListBy);
 		Assert.assertFalse(participantListEl.isEmpty());
 		return this;
 	}
 	
 	public GroupPage assertMembersInOwnerList(UserVO owner) {
-		return assertMembers(owner, "o_sel_group_coaches");
+		return assertMembers(owner, "o_sel_coaches");
 	}
 	
 	public GroupPage assertMembersInParticipantList(UserVO owner) {
-		return assertMembers(owner, "o_sel_group_participants");
+		return assertMembers(owner, "o_sel_participants");
 	}
 	
 	public GroupPage assertMembersInWaitingList(UserVO owner) {
-		return assertMembers(owner, "o_sel_group_waiting_list");
+		return assertMembers(owner, "o_sel_waiting_list");
 	}
 	
 	private GroupPage assertMembers(UserVO member, String cssClass) {
@@ -351,20 +351,20 @@ public class GroupPage {
 	}
 	
 	public boolean isInMembersOwnerList(UserVO owner) {
-		return isMembers(owner, "o_sel_group_coaches");
+		return isMembers(owner, "o_sel_coaches");
 	}
 	
 	public boolean isInMembersParticipantList(UserVO owner) {
-		return isMembers(owner, "o_sel_group_participants");
+		return isMembers(owner, "o_sel_participants");
 	}
 	
 	public boolean isInMembersInWaitingList(UserVO owner) {
-		return isMembers(owner, "o_sel_group_waiting_list");
+		return isMembers(owner, "o_sel_waiting_list");
 	}
 	
 	private boolean isMembers(UserVO member, String cssClass) {
 		String firstName = member.getFirstName();
-		By longBy = By.xpath("//div[@id='" + cssClass + "']//table//tr//td//a[contains(text(),'" + firstName + "')]");
+		By longBy = By.xpath("//div[contains(@class,'" + cssClass + "')]//div[contains(@class,'o_cmember_info_wrapper')]/a/span[contains(text(),'" + firstName + "')]");
 		List<WebElement> elements = browser.findElements(longBy);
 		return elements.size() > 0;
 	}