diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index 28119e2..3f18f38 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -11,7 +11,7 @@
 Suite Setup      Suite Setup Execution
 Suite Teardown   LDAP Suite Teardown Execution
 Test Teardown    Run Keywords  Redfish.Login  AND  FFDC On Test Case Fail
-Force Tags       Ldap_Configuration
+Test Tags       Ldap_Configuration
 
 *** Variables ***
 ${old_ldap_privilege}   Administrator
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index 3437a3e..bd59cf4 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -16,7 +16,7 @@
 
 Suite Setup       Suite Setup Execution
 
-Force Tags        Redfishtool_Certificate
+Test Tags        Redfishtool_Certificate
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_general.robot b/redfish/dmtf_tools/test_redfishtool_general.robot
index 5d0dbe9..57fa693 100644
--- a/redfish/dmtf_tools/test_redfishtool_general.robot
+++ b/redfish/dmtf_tools/test_redfishtool_general.robot
@@ -15,7 +15,7 @@
 
 Suite Setup       Suite Setup Execution
 
-Force Tags        Redfishtool_General
+Test Tags        Redfishtool_General
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_local_user.robot b/redfish/dmtf_tools/test_redfishtool_local_user.robot
index 6e380cd..e00e4d3 100644
--- a/redfish/dmtf_tools/test_redfishtool_local_user.robot
+++ b/redfish/dmtf_tools/test_redfishtool_local_user.robot
@@ -15,7 +15,7 @@
 
 Suite Setup       Suite Setup Execution
 
-Force Tags        Redfishtool_Local_User
+Test Tags        Redfishtool_Local_User
 
 *** Variables ***
 
diff --git a/redfish/events/test_bmc_snmp_config.robot b/redfish/events/test_bmc_snmp_config.robot
index 4cef11c..e72d543 100644
--- a/redfish/events/test_bmc_snmp_config.robot
+++ b/redfish/events/test_bmc_snmp_config.robot
@@ -13,7 +13,7 @@
 
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      BMC_SNMP_Config
+Test Tags       BMC_SNMP_Config
 
 *** Variables ***
 
diff --git a/redfish/events/test_bmc_snmp_trap.robot b/redfish/events/test_bmc_snmp_trap.robot
index d7d7854..6168673 100644
--- a/redfish/events/test_bmc_snmp_trap.robot
+++ b/redfish/events/test_bmc_snmp_trap.robot
@@ -15,7 +15,7 @@
 Suite Setup       Suite Setup Execution
 Suite Teardown    Suite Teardown Execution
 
-Force Tags        BMC_SNMP_Trap
+Test Tags        BMC_SNMP_Trap
 
 *** Test Cases ***
 
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 4da0f55..3ac19d4 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -29,7 +29,7 @@
 # Force the test to timedout to prevent test hanging.
 Test Timeout             45 minutes
 
-Force Tags               Bmc_Code_Update
+Test Tags               Bmc_Code_Update
 
 *** Variables ***
 
diff --git a/redfish/extended/test_power_restore.robot b/redfish/extended/test_power_restore.robot
index c84854d..523a05f 100644
--- a/redfish/extended/test_power_restore.robot
+++ b/redfish/extended/test_power_restore.robot
@@ -17,7 +17,7 @@
 Test Teardown   Test Teardown Execution
 Suite Teardown  Suite Teardown Execution
 
-Force Tags      Power_Restore
+Test Tags      Power_Restore
 
 *** Variables ***
 
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 ***
 
diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index 9f83e2e..b505b6f 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -8,7 +8,7 @@
 Test Teardown    FFDC On Test Case Fail
 Test Setup       Printn
 
-Force Tags       Service_Root
+Test Tags       Service_Root
 
 *** Test Cases ***
 
diff --git a/redfish/systems/LogServices/test_post_codes.robot b/redfish/systems/LogServices/test_post_codes.robot
index 214dae8..2f4972a 100644
--- a/redfish/systems/LogServices/test_post_codes.robot
+++ b/redfish/systems/LogServices/test_post_codes.robot
@@ -11,7 +11,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
-Force Tags       Post_Codes
+Test Tags       Post_Codes
 
 *** Variables ***
 ${max_view_count}    1000
diff --git a/redfish/systems/eventlog/test_esel.robot b/redfish/systems/eventlog/test_esel.robot
index d1947e3..7534520 100644
--- a/redfish/systems/eventlog/test_esel.robot
+++ b/redfish/systems/eventlog/test_esel.robot
@@ -15,7 +15,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          eSEL
+Test Tags          eSEL
 
 *** Variables ***
 
diff --git a/redfish/systems/eventlog/test_event_association.robot b/redfish/systems/eventlog/test_event_association.robot
index e98f55f..cfdfd66 100755
--- a/redfish/systems/eventlog/test_event_association.robot
+++ b/redfish/systems/eventlog/test_event_association.robot
@@ -15,7 +15,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          Event_Association
+Test Tags          Event_Association
 
 ***Variables***
 ${target_device_path}  /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw
diff --git a/redfish/systems/eventlog/test_event_logging.robot b/redfish/systems/eventlog/test_event_logging.robot
index 8aa676b..4853151 100644
--- a/redfish/systems/eventlog/test_event_logging.robot
+++ b/redfish/systems/eventlog/test_event_logging.robot
@@ -13,7 +13,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       Test Teardown Execution
 
-Force Tags          Event_Logging
+Test Tags          Event_Logging
 
 ** Variables ***
 
diff --git a/redfish/systems/eventlog/test_event_service.robot b/redfish/systems/eventlog/test_event_service.robot
index 77bb6ad..d22cbd4 100644
--- a/redfish/systems/eventlog/test_event_service.robot
+++ b/redfish/systems/eventlog/test_event_service.robot
@@ -12,7 +12,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       Event_Service
+Test Tags       Event_Service
 
 ***Variables***
 
diff --git a/redfish/systems/test_boot_devices.robot b/redfish/systems/test_boot_devices.robot
index e567027..de636b6 100644
--- a/redfish/systems/test_boot_devices.robot
+++ b/redfish/systems/test_boot_devices.robot
@@ -10,7 +10,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
-Force Tags       Boot_Devices
+Test Tags       Boot_Devices
 
 *** Variables ***
 # Maps for correlating redfish data values to IPMI data values.
diff --git a/redfish/task_service/test_tasks_service.robot b/redfish/task_service/test_tasks_service.robot
index 27f7e53..0f67cb9 100644
--- a/redfish/task_service/test_tasks_service.robot
+++ b/redfish/task_service/test_tasks_service.robot
@@ -13,7 +13,7 @@
 Suite Teardown      Suite Teardown Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          Tasks_Service
+Test Tags          Tasks_Service
 
 *** Variables ***
 ${TIME_REGEXP_PATTERN}   (.+)[\\-|\\+]\\d\\d\\:\\d\\d
diff --git a/redfish/telemetry_service/test_telemetry_report.robot b/redfish/telemetry_service/test_telemetry_report.robot
index dfba732..3bfa241 100644
--- a/redfish/telemetry_service/test_telemetry_report.robot
+++ b/redfish/telemetry_service/test_telemetry_report.robot
@@ -10,7 +10,7 @@
 Test Setup          Delete All Telemetry Reports
 Test Teardown       Test Teardown Execution
 
-Force Tags          Telemetry_Report
+Test Tags          Telemetry_Report
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_bmc_image_switch.robot b/redfish/update_service/test_bmc_image_switch.robot
index 77e839e..787d645 100755
--- a/redfish/update_service/test_bmc_image_switch.robot
+++ b/redfish/update_service/test_bmc_image_switch.robot
@@ -11,7 +11,7 @@
 Suite Teardown           Run Keyword And Ignore Error  Redfish.Logout
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Bmc_Image_Switch
+Test Tags               Bmc_Image_Switch
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index b50c319..e1d3632 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -10,7 +10,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags     Firmware_Inventory
+Test Tags     Firmware_Inventory
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_firmware_property.robot b/redfish/update_service/test_firmware_property.robot
index 6c32451..cd14b53 100755
--- a/redfish/update_service/test_firmware_property.robot
+++ b/redfish/update_service/test_firmware_property.robot
@@ -11,7 +11,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags    Firmware_Property
+Test Tags    Firmware_Property
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_firmware_tftp_upload_image.robot b/redfish/update_service/test_firmware_tftp_upload_image.robot
index 77db19d..f44e66b 100644
--- a/redfish/update_service/test_firmware_tftp_upload_image.robot
+++ b/redfish/update_service/test_firmware_tftp_upload_image.robot
@@ -26,7 +26,7 @@
 Test Setup       Run Keywords  Redfish Power Off  stack_mode=skip  quiet=1  AND  Redfish.Login
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Firmware_Tftp_Upload_Image
+Test Tags       Firmware_Tftp_Upload_Image
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index 162a6c0..6f754c2 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -31,7 +31,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Redfish_Bmc_Code_Update
+Test Tags               Redfish_Bmc_Code_Update
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_redfish_host_code_update.robot b/redfish/update_service/test_redfish_host_code_update.robot
index c9fc7e3..6a1052c 100644
--- a/redfish/update_service/test_redfish_host_code_update.robot
+++ b/redfish/update_service/test_redfish_host_code_update.robot
@@ -27,7 +27,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Redfish_Host_Code_Update
+Test Tags               Redfish_Host_Code_Update
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_redfish_image_upload.robot b/redfish/update_service/test_redfish_image_upload.robot
index 19b4436..c0d2257 100644
--- a/redfish/update_service/test_redfish_image_upload.robot
+++ b/redfish/update_service/test_redfish_image_upload.robot
@@ -33,7 +33,7 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags             Redfish_Image_Upload
+Test Tags             Redfish_Image_Upload
 
 *** Variables ***
 ${timeout}             20
diff --git a/redfish/update_service/test_redfish_signed_image_update.robot b/redfish/update_service/test_redfish_signed_image_update.robot
index 72d6518..d93aa33 100755
--- a/redfish/update_service/test_redfish_signed_image_update.robot
+++ b/redfish/update_service/test_redfish_signed_image_update.robot
@@ -25,7 +25,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Redfish_Signed_Image_Update
+Test Tags               Redfish_Signed_Image_Update
 
 *** Variables ***