diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Domains.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Domains.spec.ts
index 219790217f74..5e0ddd499926 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Domains.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Domains.spec.ts
@@ -516,20 +516,17 @@ test.describe('Domains Rbac', () => {
 
     // Add domain role to the user
     await visitUserProfilePage(page, user1.responseData.name);
-    await page
-      .getByTestId('user-profile')
-      .locator('.ant-collapse-expand-icon')
-      .click();
     await page.getByTestId('edit-roles-button').click();
 
-    await page
-      .getByTestId('select-user-roles')
-      .getByLabel('Select roles')
-      .click();
+    await page.locator('[data-testid="user-profile-edit-popover"]').isVisible();
+    await page.locator('input[role="combobox"]').nth(1).click();
+    await page.waitForSelector('[data-testid="profile-edit-roles-select"]');
     await page.getByText('Domain Only Access Role').click();
     await page.click('body');
     const patchRes = page.waitForResponse('/api/v1/users/*');
-    await page.getByTestId('inline-save-btn').click();
+    await page
+      .locator('[data-testid="user-profile-edit-roles-save-button"]')
+      .click();
     await patchRes;
     await afterAction();
   });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx
index 7c1e3de4583b..1c8ec9580ec2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx
@@ -227,7 +227,7 @@ const UserProfileRoles = ({
                     showSearch
                     aria-label="Roles"
                     className="w-full"
-                    data-testid="persona-edit-roles"
+                    data-testid="profile-edit-roles-select"
                     dropdownMatchSelectWidth={false}
                     filterOption={handleSearchFilterOption}
                     loading={isLoading}