diff --git a/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0 b/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0
index 54569b5ff..cb2bd77b1 100644
--- a/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0
+++ b/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0
@@ -1,7 +1,7 @@
 start:rflash_check
 description: Make sure the --check option works
 os:Linux
-mgt:openbmc
+hcp:openbmc
 cmd:rflash $$CN --check
 check:rc==0
 check:output=~$$CN: BMC Firmware Product
@@ -11,6 +11,8 @@ end
 
 start:rflash_invalid_activate
 description: Provide an invalid option for activte, file does not end in .tar
+os:Linux
+hcp:openbmc
 cmd: rflash $$CN -a /tmp/abc123.tz
 check:rc==1
 check:output=~Error: Invalid option
@@ -18,6 +20,8 @@ end
 
 start:rflash_invalid_activate_and_delete
 description: Cannot specify -a and -d at the same time
+os:Linux
+hcp:openbmc
 cmd: rflash $$CN -a 123 -d 123
 check:rc==1
 check:output=~Error: Multiple options specified is not supported
@@ -25,6 +29,8 @@ end
 
 start:rflash_invalid_id 
 description: Passing an invalid ID to activate
+os:Linux
+hcp:openbmc
 cmd: rflash $$CN -a 123
 check:rc==1
 check:output=~Error: Invalid ID provided to activate
@@ -32,6 +38,8 @@ end
 
 start:rflash_invalid_multiple_id_3
 description: Code does not currently support multiple IDs to activate
+os:Linux
+hcp:openbmc
 cmd: rflash $$CN -a 123 abc asdbas 
 check:rc==1
 check:output=~Error: More than one firmware specified is not supported
@@ -39,6 +47,8 @@ end
 
 start:rflash_invalid_multiple_id_2
 description: Code does not currently support multiple IDs to activate
+os:Linux
+hcp:openbmc
 cmd: rflash $$CN -a asdbas 123
 check:rc==1
 check:output=~Error: More than one firmware specified is not supported
@@ -46,6 +56,8 @@ end
 
 start:rflash_invalid_node
 description: Activate a valid ID hash but forget to put in a node range 
+os:Linux
+hcp:openbmc
 cmd: rflash -a 221d9020
 check:rc==1 
 check:output=~Error: Invalid nodes and/or groups in noderange: 221d9020
diff --git a/xCAT-test/autotest/testcase/UT_openbmc/rinv_cases0 b/xCAT-test/autotest/testcase/UT_openbmc/rinv_cases0
index e3c5ca1f6..c25188b0b 100644
--- a/xCAT-test/autotest/testcase/UT_openbmc/rinv_cases0
+++ b/xCAT-test/autotest/testcase/UT_openbmc/rinv_cases0
@@ -1,7 +1,7 @@
 start:rinv_check_active_fw
 description: Ensure that there is only 1 active BMC and 1 Active PNOR
 os:Linux
-mgt:openbmc
+hcp:openbmc
 cmd:rinv $$CN firm | grep -i ibm
 check:rc==0
 check:output=~$$CN: BMC Firmware Product
@@ -13,7 +13,7 @@ end
 start:rinv_check_active_fw_count 
 description: Ensure that there are only 2 active firmware (if previous test is OK)
 os:Linux
-mgt:openbmc
+hcp:openbmc
 # show the output
 cmd:rinv $$CN firm | grep -i ibm 
 check:rc==0
@@ -26,7 +26,7 @@ end
 start:rinv_check_active_fw_verbose_count
 description: Ensure that there is only 2 active firmware (in verbose mode) (Issue #4236)
 os:Linux
-mgt:openbmc
+hcp:openbmc
 # show the output
 cmd:rinv $$CN firm -V | grep -i Active 
 check:rc==0