diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 6c122d1..43d5b56 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -8,6 +8,7 @@
 Resource          ../../lib/bmc_redfish_utils.robot
 Resource          ../../lib/utils.robot
 Resource          ../../lib/bmc_redfish_resource.robot
+Resource          ../../lib/external_intf/management_console_utils.robot
 
 Suite Setup       Suite Setup Execution
 Test Teardown     Test Teardown Execution
@@ -552,6 +553,7 @@
     Redfish BMC Reset Operation
     Set Global Variable  ${XAUTH_TOKEN}  ${before_reboot_xauth_token}
 
+    Wait Until Keyword Succeeds  3 min  10 sec  Redfish BMC Match States  match_state=Enabled
     Is BMC Standby
 
     Redfish Upload Partition File  ${file_name}
@@ -574,6 +576,7 @@
     Redfish BMC Reset Operation
     Set Global Variable  ${XAUTH_TOKEN}  ${before_reboot_xauth_token}
 
+    Wait Until Keyword Succeeds  3 min  10 sec  Redfish BMC Match States  match_state=Enabled
     Is BMC Standby
 
     Verify Partition File On BMC  ${Partition_file_list}  Partition_status=1
@@ -651,6 +654,7 @@
     Run Keyword If  ${True} == ${reboot_flag}
     ...  Run Keywords  Redfish BMC Reset Operation  AND
     ...  Set Global Variable  ${XAUTH_TOKEN}  ${before_reboot_xauth_token}  AND
+    ...  Wait Until Keyword Succeeds  3 min  10 sec  Redfish BMC Match States  match_state=Enabled  AND
     ...  Is BMC Standby  AND
     ...  Initialize OpenBMC  AND
     ...  Verify Redfish Partition File Content  ${Partition_file_list}  ${content_dict}  ${HTTP_OK}
@@ -683,6 +687,7 @@
     Run Keyword If  ${True} == ${reboot_flag}
     ...  Run Keywords  Redfish BMC Reset Operation  AND
     ...  Set Global Variable  ${XAUTH_TOKEN}  ${before_reboot_xauth_token}  AND
+    ...  Wait Until Keyword Succeeds  3 min  10 sec  Redfish BMC Match States  match_state=Enabled  AND
     ...  Is BMC Standby  AND
     ...  Initialize OpenBMC
 
@@ -715,6 +720,7 @@
     Run Keyword If  ${True} == ${reboot_flag}
     ...  Run Keywords  Redfish BMC Reset Operation  AND
     ...  Set Global Variable  ${XAUTH_TOKEN}  ${before_reboot_xauth_token}  AND
+    ...  Wait Until Keyword Succeeds  3 min  10 sec  Redfish BMC Match States  match_state=Enabled  AND
     ...  Is BMC Standby  AND
     ...  Initialize OpenBMC