2 files changed, 9 insertions, 6 deletions
diff --git a/install/ui/test/functional/group-add-member-user.html b/install/ui/test/functional/group-add-member-user.html
index e7966cda..421c3e14 100755
--- a/install/ui/test/functional/group-add-member-user.html
+++ b/install/ui/test/functional/group-add-member-user.html
@@ -52,6 +52,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='group']/span[@name='association']/table/tbody/tr/td[1]/input[@value='testuser']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>//div[@id='group']/div[1]/ul/li[1]/span</td>
 	<td></td>
@@ -61,7 +66,6 @@
 	<td>4 groups matched</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/group-delete-member-user.html b/install/ui/test/functional/group-delete-member-user.html
index 831a1d71..b8e62407 100755
--- a/install/ui/test/functional/group-delete-member-user.html
+++ b/install/ui/test/functional/group-delete-member-user.html
@@ -23,17 +23,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='group']/div[1]/ul/li[4]</td>
+	<td>//div[@id='group']/div[1]/ul/li[@title='member_user']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='group']/span/table/tbody/tr</td>
+	<td>//div[@id='group']/span[@name='association']/table/tbody/tr/td[1]/input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='group']/span/table/tbody/tr/td[1]/input</td>
+	<td>//div[@id='group']/span[@name='association']/table/tbody/tr/td[1]/input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,7 +47,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextNotPresent</td>
+	<td>waitForElementNotPresent</td>
 	<td>//div[@id='group']/span/table/tbody/tr</td>
 	<td></td>
 </tr>
@@ -61,7 +61,6 @@
 	<td>4 groups matched</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>