diff --git a/redfish/managers/test_bmc_dumps.robot b/redfish/managers/test_bmc_dumps.robot
index 78cac89..62ce39f 100644
--- a/redfish/managers/test_bmc_dumps.robot
+++ b/redfish/managers/test_bmc_dumps.robot
@@ -12,7 +12,7 @@
 Test Setup          Redfish Delete All BMC Dumps
 Test Teardown       Test Teardown Execution
 
-Force Tags          BMC_Dumps
+Test Tags          BMC_Dumps
 
 *** Variables ***
 
diff --git a/redfish/managers/test_bmc_ipv6.robot b/redfish/managers/test_bmc_ipv6.robot
index 04853cf..7cbdb41 100644
--- a/redfish/managers/test_bmc_ipv6.robot
+++ b/redfish/managers/test_bmc_ipv6.robot
@@ -12,7 +12,7 @@
 Test Teardown  Test Teardown Execution
 Suite Setup    Suite Setup Execution
 
-Force Tags     BMC_IPv6
+Test Tags     BMC_IPv6
 
 *** Variables ***
 ${test_ipv6_addr}          2001:db8:3333:4444:5555:6666:7777:8888
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index bf26541..bd0ffef 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -13,7 +13,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags     Bmc_Network_Conf
+Test Tags     Bmc_Network_Conf
 
 *** Variables ***
 ${test_hostname}           openbmc
diff --git a/redfish/managers/test_bmc_network_mac.robot b/redfish/managers/test_bmc_network_mac.robot
index 82240e4..b20f6b0 100644
--- a/redfish/managers/test_bmc_network_mac.robot
+++ b/redfish/managers/test_bmc_network_mac.robot
@@ -9,7 +9,7 @@
 Suite Setup    Suite Setup Execution
 Test Teardown  Test Teardown Execution
 
-Force Tags     Bmc_Network_Mac
+Test Tags     Bmc_Network_Mac
 
 *** Variables ***
 
diff --git a/redfish/managers/test_bmc_protocol_settings.robot b/redfish/managers/test_bmc_protocol_settings.robot
index f87c7f1..da44021 100644
--- a/redfish/managers/test_bmc_protocol_settings.robot
+++ b/redfish/managers/test_bmc_protocol_settings.robot
@@ -9,7 +9,7 @@
 Suite Teardown  Run Keywords  Enable IPMI Protocol  ${initial_ipmi_state}  AND  Redfish.Logout
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      BMC_Protocol_Settings
+Test Tags      BMC_Protocol_Settings
 
 *** Variables ***
 
diff --git a/redfish/managers/test_certificate.robot b/redfish/managers/test_certificate.robot
index e71a33a..db064ec 100644
--- a/redfish/managers/test_certificate.robot
+++ b/redfish/managers/test_certificate.robot
@@ -7,7 +7,7 @@
 Resource         ../../lib/certificate_utils.robot
 Library          String
 
-Force Tags       Certificate
+Test Tags       Certificate
 
 Suite Setup      Suite Setup Execution
 Suite Teardown   Suite Teardown
diff --git a/redfish/managers/test_managers_bmc_time.robot b/redfish/managers/test_managers_bmc_time.robot
index e7b01d2..9671542 100644
--- a/redfish/managers/test_managers_bmc_time.robot
+++ b/redfish/managers/test_managers_bmc_time.robot
@@ -13,7 +13,7 @@
 Suite Setup                  Suite Setup Execution
 Suite Teardown               Suite Teardown Execution
 
-Force Tags                   Managers_BMC_Time
+Test Tags                   Managers_BMC_Time
 
 *** Variables ***
 
diff --git a/redfish/managers/test_multiple_interfaces_dhcp.robot b/redfish/managers/test_multiple_interfaces_dhcp.robot
index af9b85d..a5cf1c0 100644
--- a/redfish/managers/test_multiple_interfaces_dhcp.robot
+++ b/redfish/managers/test_multiple_interfaces_dhcp.robot
@@ -33,7 +33,7 @@
 ...                                UseNTPServers=${False}
 ...                                UseDNSServers=${False}
 
-Force Tags                         Multiple_Interfaces_DHCP
+Test Tags                         Multiple_Interfaces_DHCP
 
 *** Test Cases ***