diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/WhoAmI.java b/src/main/java/org/jenkinsci/test/acceptance/po/WhoAmI.java
new file mode 100644
index 000000000..eb89296a6
--- /dev/null
+++ b/src/main/java/org/jenkinsci/test/acceptance/po/WhoAmI.java
@@ -0,0 +1,11 @@
+package org.jenkinsci.test.acceptance.po;
+
+/**
+ * Who Am I page in Jenkins
+ */
+public class WhoAmI extends ContainerPageObject {
+
+    public WhoAmI(ContainerPageObject parent) {
+        super(parent, parent.url("whoAmI/"));
+    }
+}
diff --git a/src/test/java/plugins/OicAuthPluginTest.java b/src/test/java/plugins/OicAuthPluginTest.java
index c4dd80dda..a08f4849a 100644
--- a/src/test/java/plugins/OicAuthPluginTest.java
+++ b/src/test/java/plugins/OicAuthPluginTest.java
@@ -4,16 +4,16 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
 import org.jenkinsci.test.acceptance.junit.WithPlugins;
 import org.jenkinsci.test.acceptance.po.GlobalSecurityConfig;
 import org.jenkinsci.test.acceptance.po.LoggedInAuthorizationStrategy;
 import org.jenkinsci.test.acceptance.po.OicAuthSecurityRealm;
+import org.jenkinsci.test.acceptance.po.WhoAmI;
 import org.jenkinsci.test.acceptance.utils.keycloack.KeycloakUtils;
+import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -248,15 +248,12 @@ private void assertLoggedOut() {
 
     private void assertLoggedUser(KeycloakUtils.User expectedUser, String roleToCheck) {
         assertThat("User has logged in Jenkins", jenkins.getCurrentUser().id(), is(expectedUser.getId()));
-        jenkins.visit("whoAmI");
-
-        // TODO if needed for more tests, consider to create a proper WhoAmI PageObject
-        // for this test we just need the authorities, which are displayed in UI as <li>"role_name"</li>, we can get
-        // all of "li" tags and check our roles are there
-        // Note the quotes surrounding the role name
-        Set<String> allLiTagsInPage = this.driver.findElements(by.tagName("li")).stream().map(webElement -> StringUtils.defaultString(webElement.getText())
-                .replace("\"", "")).collect(Collectors.toSet());
-        assertThat("User has the expected roles inherited from keycloak", roleToCheck, is(in(allLiTagsInPage)));
+
+        WhoAmI whoAmI = new WhoAmI(jenkins);
+        whoAmI.open();
+        JSONObject jsonData = new JSONObject(whoAmI.getJson().toString());
+        assertThat("User is the expected one", jsonData.getString("name"), is(expectedUser.getId()));
+        assertThat("User has the expected roles inherited from keycloak", roleToCheck, is(in(jsonData.getJSONArray("authorities").toList())));
 
         KeycloakUtils.User fromKeyCloak = keycloakUtils.getCurrentUser(keycloak.getAuthServerUrl(), REALM);
         assertThat("User has logged in keycloack", fromKeyCloak.getUserName(), is(expectedUser.getUserName()));