diff --git a/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx b/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
index 8433f54a733437..29d87e31797cc9 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
@@ -262,6 +262,7 @@ export const UserForm: FunctionComponent<UserFormProps> = ({
         >
           <EuiFieldText
             name="username"
+            data-test-subj={'userFormUserNameInput'}
             icon="user"
             value={form.values.username}
             isLoading={form.isValidating}
@@ -283,6 +284,7 @@ export const UserForm: FunctionComponent<UserFormProps> = ({
             >
               <EuiFieldText
                 name="full_name"
+                data-test-subj={'userFormFullNameInput'}
                 value={form.values.full_name}
                 isInvalid={form.touched.full_name && !!form.errors.full_name}
                 onChange={eventHandlers.onChange}
@@ -298,6 +300,7 @@ export const UserForm: FunctionComponent<UserFormProps> = ({
             >
               <EuiFieldText
                 name="email"
+                data-test-subj={'userFormEmailInput'}
                 value={form.values.email}
                 isInvalid={form.touched.email && !!form.errors.email}
                 onChange={eventHandlers.onChange}
@@ -337,6 +340,7 @@ export const UserForm: FunctionComponent<UserFormProps> = ({
           >
             <EuiFieldPassword
               name="password"
+              data-test-subj={'passwordInput'}
               type="dual"
               value={form.values.password}
               isInvalid={form.touched.password && !!form.errors.password}
@@ -354,6 +358,7 @@ export const UserForm: FunctionComponent<UserFormProps> = ({
           >
             <EuiFieldPassword
               name="confirm_password"
+              data-test-subj={'passwordConfirmationInput'}
               type="dual"
               value={form.values.confirm_password}
               isInvalid={form.touched.confirm_password && !!form.errors.confirm_password}
diff --git a/x-pack/test/functional/apps/security/management.js b/x-pack/test/functional/apps/security/management.js
index 51d460e386ebee..ae14dba2ad60ea 100644
--- a/x-pack/test/functional/apps/security/management.js
+++ b/x-pack/test/functional/apps/security/management.js
@@ -15,17 +15,16 @@ export default function ({ getService, getPageObjects }) {
 
   const USERS_PATH = 'security/users';
   const EDIT_USERS_PATH = `${USERS_PATH}/edit`;
+  const CREATE_USERS_PATH = `${USERS_PATH}/create`;
 
   const ROLES_PATH = 'security/roles';
   const EDIT_ROLES_PATH = `${ROLES_PATH}/edit`;
   const CLONE_ROLES_PATH = `${ROLES_PATH}/clone`;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/61173
-  describe.skip('Management', function () {
+  describe('Management', function () {
     this.tags(['skipFirefox']);
 
     before(async () => {
-      // await PageObjects.security.login('elastic', 'changeme');
       await PageObjects.security.initTests();
       await kibanaServer.uiSettings.update({
         defaultIndex: 'logstash-*',
@@ -49,14 +48,14 @@ export default function ({ getService, getPageObjects }) {
           await PageObjects.security.clickElasticsearchUsers();
           await PageObjects.security.clickCreateNewUser();
           const currentUrl = await browser.getCurrentUrl();
-          expect(currentUrl).to.contain(EDIT_USERS_PATH);
+          expect(currentUrl).to.contain(CREATE_USERS_PATH);
         });
 
         it('Clicking cancel in create user section brings user back to listing', async () => {
           await PageObjects.security.clickCancelEditUser();
           const currentUrl = await browser.getCurrentUrl();
           expect(currentUrl).to.contain(USERS_PATH);
-          expect(currentUrl).to.not.contain(EDIT_USERS_PATH);
+          expect(currentUrl).to.not.contain(CREATE_USERS_PATH);
         });
 
         it('Clicking save in create user section brings user back to listing', async () => {
@@ -68,11 +67,12 @@ export default function ({ getService, getPageObjects }) {
           await testSubjects.setValue('userFormFullNameInput', 'Full User Name');
           await testSubjects.setValue('userFormEmailInput', 'example@example.com');
 
-          await PageObjects.security.clickSaveEditUser();
+          //await PageObjects.security.clickSaveEditUser();
+          await PageObjects.security.clickSaveCreateUser();
 
           const currentUrl = await browser.getCurrentUrl();
           expect(currentUrl).to.contain(USERS_PATH);
-          expect(currentUrl).to.not.contain(EDIT_USERS_PATH);
+          expect(currentUrl).to.not.contain(CREATE_USERS_PATH);
         });
 
         it('Can navigate to edit user section', async () => {
@@ -146,10 +146,12 @@ export default function ({ getService, getPageObjects }) {
           await PageObjects.security.assignRoleToUser('kibana_dashboard_only_user');
           await PageObjects.security.assignRoleToUser('logstash-readonly');
 
-          await PageObjects.security.clickSaveEditUser();
+          await PageObjects.security.clickSaveCreateUser();
 
           await PageObjects.settings.navigateTo();
-          await testSubjects.click('users');
+          await testSubjects.click('roles');
+          await testSubjects.click('tablePaginationPopoverButton');
+          await testSubjects.click('tablePagination-100-rows');
           await PageObjects.settings.clickLinkText('kibana_dashboard_only_user');
           const currentUrl = await browser.getCurrentUrl();
           expect(currentUrl).to.contain(EDIT_ROLES_PATH);
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index f153050018609c..97a5c517db794b 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -290,6 +290,11 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
       await PageObjects.header.waitUntilLoadingHasFinished();
     }
 
+    async clickSaveCreateUser() {
+      await find.clickByButtonText('Create user');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+    }
+
     async clickSaveEditRole() {
       const saveButton = await retry.try(() => testSubjects.find('roleFormSaveButton'));
       await saveButton.moveMouseTo();