diff --git a/js/apps/admin-ui/test/autentication/policies.ts b/js/apps/admin-ui/test/autentication/policies.ts
index f9496d0bdb1..2b141f7ce20 100644
--- a/js/apps/admin-ui/test/autentication/policies.ts
+++ b/js/apps/admin-ui/test/autentication/policies.ts
@@ -10,10 +10,8 @@ export async function assertSupportedApplications(
   page: Page,
   applications: string[],
 ) {
-  const supportedApplications = await page
-    .getByTestId("supportedApplications")
-    .textContent();
-  expect(supportedApplications).toEqual(applications.join(""));
+  const supportedApplications = page.getByTestId("supportedApplications");
+  await expect(supportedApplications).toHaveText(applications.join(""));
 }
 
 export async function setPolicyType(page: Page, type: string) {
diff --git a/js/apps/admin-ui/test/clients/advanced.ts b/js/apps/admin-ui/test/clients/advanced.ts
index 659068cfa01..242e016dbe2 100644
--- a/js/apps/admin-ui/test/clients/advanced.ts
+++ b/js/apps/admin-ui/test/clients/advanced.ts
@@ -27,7 +27,11 @@ export async function assertTestClusterAvailability(
   expected: boolean = true,
 ) {
   const button = page.getByTestId("test-cluster-availability");
-  expect(await button.isDisabled()).toBe(!expected);
+  if (expected) {
+    await expect(button).toBeEnabled();
+  } else {
+    await expect(button).toBeDisabled();
+  }
 }
 
 export async function deleteClusterNode(page: Page, host: string) {
@@ -91,11 +95,12 @@ export async function assertTokenLifespanClientOfflineSessionMaxVisible(
   page: Page,
   visible: boolean,
 ) {
-  expect(
-    await page
-      .getByTestId("token-lifespan-clientOfflineSessionMax")
-      .isVisible(),
-  ).toBe(visible);
+  const locator = page.getByTestId("token-lifespan-clientOfflineSessionMax");
+  if (visible) {
+    await expect(locator).toBeVisible();
+  } else {
+    await expect(locator).toBeHidden();
+  }
 }
 
 const oAuthMutualSwitch =
diff --git a/js/apps/admin-ui/test/clients/authorization.ts b/js/apps/admin-ui/test/clients/authorization.ts
index 1919907e1d5..4f73e1e53c2 100644
--- a/js/apps/admin-ui/test/clients/authorization.ts
+++ b/js/apps/admin-ui/test/clients/authorization.ts
@@ -128,7 +128,7 @@ export async function assertClipboardHasText(page: Page) {
   const clipboardText = await page.evaluateHandle(() =>
     navigator.clipboard.readText(),
   );
-  expect(page.getByTestId("authorization-export-code-editor")).toHaveText(
+  await expect(page.getByTestId("authorization-export-code-editor")).toHaveText(
     await clipboardText.jsonValue(),
   );
 }
diff --git a/js/apps/admin-ui/test/identity-providers/main.ts b/js/apps/admin-ui/test/identity-providers/main.ts
index 2e0f6a24351..bc32856cc53 100644
--- a/js/apps/admin-ui/test/identity-providers/main.ts
+++ b/js/apps/admin-ui/test/identity-providers/main.ts
@@ -82,9 +82,9 @@ async function assertElementExists(
   exist: boolean = true,
 ) {
   if (exist) {
-    expect(page.locator(locator)).toBeVisible();
+    await expect(page.locator(locator)).toBeVisible();
   } else {
-    expect(page.locator(locator)).not.toBeVisible();
+    await expect(page.locator(locator)).toBeHidden();
   }
 }
 
diff --git a/js/apps/admin-ui/test/realm-settings/general.spec.ts b/js/apps/admin-ui/test/realm-settings/general.spec.ts
index 0650ec069ef..6a0a1e288ba 100644
--- a/js/apps/admin-ui/test/realm-settings/general.spec.ts
+++ b/js/apps/admin-ui/test/realm-settings/general.spec.ts
@@ -51,7 +51,7 @@ test.describe("Realm settings general tab tests", () => {
     expect(response.status()).toBe(200);
   });
 
-  test("Test all general tab switches", async ({ page }) => {
+  test("all general tab switches", async ({ page }) => {
     await switchOn(page, "#userManagedAccessAllowed");
     await clickSaveRealm(page);
     await assertNotificationMessage(page, "Realm successfully updated");
@@ -61,7 +61,7 @@ test.describe("Realm settings general tab tests", () => {
     await assertNotificationMessage(page, "Realm successfully updated");
   });
 
-  test("Test realm enable/disable switch", async ({ page }) => {
+  test("realm enable/disable switch", async ({ page }) => {
     // Enable realm
     await switchOn(page, `#${realmName}-switch`);
     await assertNotificationMessage(page, "Realm successfully updated");
diff --git a/js/apps/admin-ui/test/utils/form.ts b/js/apps/admin-ui/test/utils/form.ts
index c7d6e9e62de..92f9417561f 100644
--- a/js/apps/admin-ui/test/utils/form.ts
+++ b/js/apps/admin-ui/test/utils/form.ts
@@ -23,8 +23,8 @@ export async function selectItem(
 }
 
 export async function assertSelectValue(field: Locator, value: string) {
-  const text = await field.textContent();
-  expect(text).toBe(value);
+  const text = field;
+  await expect(text).toHaveText(value);
 }
 
 export async function switchOn(page: Page, id: string | Locator) {
diff --git a/js/eslint.config.js b/js/eslint.config.js
index 9d2f0f1ebc5..359e8fbaf5f 100644
--- a/js/eslint.config.js
+++ b/js/eslint.config.js
@@ -138,7 +138,7 @@ export default tseslint.config(
   },
   {
     ...playwright.configs["flat/recommended"],
-    files: ["apps/account-ui/test/**"],
+    files: ["apps/account-ui/test/**", "apps/admin-ui/test/**"],
   },
   {
     files: ["libs/keycloak-admin-client/test/**"],