diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index b897325..4a43a80 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -55,7 +55,7 @@
 #https://github.com/openbmc/openbmc/issues/1357
 -e Verify_Core_Functional_State
 #https://github.com/openbmc/openbmc/issues/1572
--e Test_Restore_Policy_RESTORE_LAST_STATE_With_Host_Running
+-e Test_Restore_Policy_Restore_Last_State_With_Host_Running
 #https://github.com/openbmc/openbmc/issues/1571
 -e Verify_Host_Quiesce_State_Without_Auto_Reboot
 # System LED test cases which are NA for Witherspoon system.
diff --git a/tests/test_power_restore.robot b/tests/test_power_restore.robot
index fe8358a..a787cb8 100644
--- a/tests/test_power_restore.robot
+++ b/tests/test_power_restore.robot
@@ -77,7 +77,7 @@
     [Tags]  Test_Restore_Policy_ALWAYS_POWER_ON_With_Host_Running
 
 
-Test Restore Policy RESTORE_LAST_STATE With Host Running
+Test Restore Policy Restore Last State With Host Running
     # Policy                Initial Host State     Expected Host State
 
     RESTORE_LAST_STATE      Running                Running
@@ -93,17 +93,17 @@
     ...                    specific state.
 
     [Template]  Verify Restore Policy
-    [Tags]  Test_Restore_Policy_RESTORE_LAST_STATE_With_Host_Running
+    [Tags]  Test_Restore_Policy_Restore_Last_State_With_Host_Running
 
 
-Test Restore Policy RESTORE_LAST_STATE With Host Off
+Test Restore Policy Restore Last State With Host Off
     # Policy                Initial Host State     Expected Host State
 
     RESTORE_LAST_STATE      Off                    Off
 
 
     [Template]  Verify Restore Policy
-    [Tags]  Test_Restore_Policy_RESTORE_LAST_STATE_With_Host_Off
+    [Tags]  Test_Restore_Policy_Restore_Last_State_With_Host_Off
 
 
 *** Keywords ***