diff --git a/openpower/test_bios_attributes.robot b/pldm/test_redfish_bios_attributes.robot
similarity index 98%
rename from openpower/test_bios_attributes.robot
rename to pldm/test_redfish_bios_attributes.robot
index 91caa12..e865c4b 100755
--- a/openpower/test_bios_attributes.robot
+++ b/pldm/test_redfish_bios_attributes.robot
@@ -12,7 +12,7 @@
 Test Teardown    FFDC On Test Case Fail
 
 Suite Setup      Redfish BIOS Suite Setup
-Suite Teardown   Redfish BIOS Suite Cleanup
+Suite Teardown   Run Keyword And Ignore Error  Redfish BIOS Suite Cleanup
 
 *** Variables ***