diff --git a/openpower/test_inband_bmc_auth_reset.robot b/openpower/test_inband_bmc_auth_reset.robot
new file mode 100644
index 0000000..9f3dece
--- /dev/null
+++ b/openpower/test_inband_bmc_auth_reset.robot
@@ -0,0 +1,32 @@
+*** Settings ***
+Documentation   OEM IPMI in-band BMC authentication reset.
+
+# This resets the BMC authentication:
+# - Enable local users if they were disabled.
+# - Delete the LDAP configuration if there was one.
+# - Reset the root password back to the default one.
+
+Resource        ../lib/resource.txt
+Resource        ../lib/ipmi_client.robot
+Resource        ../lib/boot_utils.robot
+Library         ../lib/ipmi_utils.py
+
+Test Teardown   FFDC On Test Case Fail
+
+*** Test Cases ***
+
+Test Inband IPMI Auth Reset
+    [Documentation]  Trigger in-band BMC authentication reset and verify.
+    [Tags]  Test_Inband_IPMI_Auth_Reset
+
+    Create Session  openbmc  ${AUTH_URI}  max_retries=1
+    ${headers}=  Create Dictionary  Content-Type=application/json
+    @{credentials}=  Create List  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
+    ${data}=  create dictionary   data=@{credentials}
+    ${resp}=  Post Request  openbmc  /login  data=${data}  headers=${headers}
+    Should Be Equal As Strings  ${resp.status_code}  ${HTTP_UNAUTHORIZED}
+
+    # Call reset method.
+    Run Inband IPMI Raw Command  0x3a 0x11
+
+    Initialize OpenBMC
diff --git a/openpower/test_inband_factory_reset.robot b/openpower/test_inband_factory_reset.robot
deleted file mode 100644
index 5983331..0000000
--- a/openpower/test_inband_factory_reset.robot
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-Documentation   OEM IPMI in-band factory reset.
-
-Resource        ../lib/resource.txt
-Resource        ../lib/ipmi_client.robot
-Resource        ../lib/boot_utils.robot
-Library         ../lib/ipmi_utils.py
-
-
-Test Teardown   FFDC On Test Case Fail
-Test Setup      Delete All Error Logs
-
-*** Test Cases ***
-
-Test Inband IPMI Factory Reset
-    [Documentation]  Trigger inband factory reset and verify.
-    [Tags]  Test_Inband_IPMI_Factory_Reset
-
-    REST Power On  stack_mode=skip
-
-    ${network_info}=  Get Lan Print Dict  ipmi_cmd_type=inband
-    Should Not Be Empty  ${network_info}
-
-    # Call reset method.
-    Run Inband IPMI Raw Command  0x32 0x20
-
-    # Reboot BMC.
-    Run Inband IPMI Raw Command  0x06 0x03
-
-    # Allow BMC to shutdown.
-    Sleep  1 min
-
-    # Check if BMC comes back online and IPMI host services are responding.
-    Wait Until Keyword Succeeds  10 min  30 sec
-    ...  Run Inband IPMI Raw Command  lan print
-
-    Set BMC Network From Host  ${network_info}