diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index 279bc34..4bc4911 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -122,12 +122,11 @@
     Should Be Equal    ${flag}    CDROM
 
 Set boot policy to invalid value
-    [Documentation]   This testcase is to verify that proper error message is prompted
-    ...               when invalid value to provided to boot policy.
-    ...               Existing Issue: https://github.com/openbmc/openbmc/issues/552
-    [Tags]  known_issue
+    [Documentation]   This testcase verify that the boot policy doesn't get
+    ...               updated with invalid policy supplied by user.
+    [Tags]  Set_boot_policy_to_invalid_value
 
-    Set Boot Policy   abc
+    Run Keyword and Ignore Error    Set Boot Policy   abc
 
     ${boot} =   Read Attribute  /org/openbmc/settings/host0    boot_policy
     Should Not Be Equal    ${boot}    abc