diff --git a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/users/Users.java b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/users/Users.java
index 7e4f417..4232289 100644
--- a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/users/Users.java
+++ b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/users/Users.java
@@ -53,7 +53,7 @@ public class Users extends AdminConsoleRealm {
public static final String IMPERSONATE = "Impersonate";
public static final String DELETE = "Delete";
- @FindBy(xpath = "//div[./h1[text()='Users']]/table")
+ @FindBy(id = "user-table")
private UsersTable table;
public UsersTable table() {
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/user-list.html b/themes/src/main/resources/theme/base/admin/resources/partials/user-list.html
index be44c9a..1fc707c 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/user-list.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/user-list.html
@@ -2,7 +2,7 @@
<kc-tabs-users></kc-tabs-users>
- <table class="table table-striped table-bordered">
+ <table class="table table-striped table-bordered" id="user-table">
<caption data-ng-show="users" class="hidden">{{:: 'table-of-realm-users' | translate}}</caption>
<thead>
<tr>
