diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFindUserOnLockedUsersGridActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFindUserOnLockedUsersGridActionGroup.xml
new file mode 100644
index 0000000000000..7cdbc71b38f8e
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFindUserOnLockedUsersGridActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUnlockAdminUserEntityOnGridActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUnlockAdminUserEntityOnGridActionGroup.xml
new file mode 100644
index 0000000000000..e23cc0b2a7308
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUnlockAdminUserEntityOnGridActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminLockedUsersGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminLockedUsersGridSection.xml
new file mode 100644
index 0000000000000..6eae8740765f9
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminLockedUsersGridSection.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminUnlockAdminUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminUnlockAdminUserEntityTest.xml
new file mode 100644
index 0000000000000..df8e8fe77ddbc
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminUnlockAdminUserEntityTest.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+