diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index 91a665d..fdb7166 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -81,11 +81,10 @@
     ${flag}=   Read Attribute  /org/openbmc/settings/host0    boot_flags
     Should Be Equal    ${flag}    CDROM
 
-Onetime boot order after warm reset
-    [Documentation]   This testcase is to verify that boot policy and order does not change
-    ...               after warm reset on a system with onetime boot policy.
-    ...               Existing Issue: https://github.com/openbmc/openbmc/issues/519
-    [Tags]  chassisboot    known_issue
+Persist ONETIME Boot Policy After Reset
+    [Documentation]   Verify ONETIME boot policy order does not change
+    ...               on warm reset.
+    [Tags]  chassisboot   Persist_ONETIME Boot_Policy_After_Reset
 
     Initiate Power On
 
@@ -101,11 +100,10 @@
     ${flag}=   Read Attribute  /org/openbmc/settings/host0    boot_flags
     Should Be Equal    ${flag}    Network
 
-Permanent boot order after warm reset
-    [Documentation]   This testcase is to verify that boot policy and order does not change
-    ...               after warm reset on a system with permanent boot policy.
-    ...               Existing Issue: https://github.com/openbmc/openbmc/issues/519
-    [Tags]  chassisboot    known_issue
+Persist PERMANENT Boot Policy After Reset
+    [Documentation]   Verify PERMANENT boot policy order does not change
+    ...               on warm reset.
+    [Tags]  chassisboot    Persist_PERMANENT_Boot_Policy_After_Reset
 
     Initiate Power On
 
diff --git a/tests/test_warmreset.robot b/tests/test_warmreset.robot
index d6427a9..00de7c0 100644
--- a/tests/test_warmreset.robot
+++ b/tests/test_warmreset.robot
@@ -19,8 +19,7 @@
 
 Test WarmReset via REST
     [Documentation]   This testcase is to verify warm reset using REST.
-    ...               Existing Issue: https://github.com/openbmc/openbmc/issues/519
-    [Tags]  known_issue
+    [Tags]  Test_WarmReset_via_REST
 
     ${warm_test_file}=  Set Variable    /tmp/before_warmreset
     Open Connection And Log In