diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 13922b6..40b0a3d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -173,7 +173,7 @@
     Example:
         Suite:  test_boot_progress_code.robot
 
-        Force Tags    Boot_Progress_Code
+        Test Tags    Boot_Progress_Code
     ```
 
   - Create a tag for every test case with a tag name that mirrors the test case
diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index dbd3ef8..b096fd2 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -22,7 +22,7 @@
 # Force the test to timedout to prevent test hanging.
 Test Timeout      30 minutes
 
-Force Tags        BMC_Code_Update
+Test Tags        BMC_Code_Update
 
 *** Variables ***
 
diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 728a80f..229aa76 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -29,7 +29,7 @@
 
 Test Teardown     Code Update Test Teardown
 
-Force Tags        Host_Code_Update
+Test Tags        Host_Code_Update
 
 *** Variables ***
 
diff --git a/extended/factory_reset.robot b/extended/factory_reset.robot
index f221256..43e693f 100644
--- a/extended/factory_reset.robot
+++ b/extended/factory_reset.robot
@@ -10,7 +10,7 @@
 Suite Setup      Validate Setup
 Suite Teardown   Close All Connections
 
-Force Tags  Factory_Reset
+Test Tags  Factory_Reset
 
 *** Test Cases ***
 
diff --git a/extended/run_keyword.robot b/extended/run_keyword.robot
index 31253c7..c5caf45 100644
--- a/extended/run_keyword.robot
+++ b/extended/run_keyword.robot
@@ -32,7 +32,7 @@
 # NOTE: Robot searches PYTHONPATH for libraries.
 Library   run_keyword.py
 
-Force Tags  Run_Keyword_Pgm
+Test Tags  Run_Keyword_Pgm
 
 *** Variables ***
 # Initialize program parameters variables.
diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index 8b02797..84d8f8c 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -11,7 +11,7 @@
 Suite Teardown    Close All Connections
 Test Teardown     FFDC On Test Case Fail
 
-Force Tags  AC_Cycles
+Test Tags  AC_Cycles
 
 *** Test Cases ***
 
diff --git a/extended/test_bios_update.robot b/extended/test_bios_update.robot
index 607b6c6..7649f6e 100644
--- a/extended/test_bios_update.robot
+++ b/extended/test_bios_update.robot
@@ -12,7 +12,7 @@
 
 Test Teardown           Test Teardown Execution
 
-Force Tags  BIOS_Code_Update
+Test Tags  BIOS_Code_Update
 
 *** Variables ***
 
diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index 5e7b22a..3dbed36 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -7,7 +7,7 @@
 Test Setup      Launch Browser And Login GUI
 Suite Teardown  Close Browser
 
-Force Tags      GUI_Header
+Test Tags      GUI_Header
 
 *** Variables ***
 
diff --git a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
index a2bf226..5fc27cf 100644
--- a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
+++ b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Profile_Settings_Sub_Menu
+Test Tags      Profile_Settings_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
index 1cb457d..b486da7 100644
--- a/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Inventory_And_Leds_Sub_Menu
+Test Tags      Inventory_And_Leds_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
index d55934e..21357b0 100644
--- a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
@@ -6,7 +6,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Sensors_Sub_Menu
+Test Tags      Sensors_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot b/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot
index 61a77c3..4cecdd1 100755
--- a/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot
+++ b/gui/gui_test/logs_and_services_menu/test_event_logs_sub_menu.robot
@@ -9,7 +9,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Suite Teardown Execution
 
-Force Tags      Event_Logs_Sub_Menu
+Test Tags      Event_Logs_Sub_Menu
 
 *** Variables ***
 ${xpath_event_logs_heading}       //h1[text()="Event logs"]
diff --git a/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot b/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot
index cae8335..541193e 100644
--- a/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot
+++ b/gui/gui_test/logs_and_services_menu/test_progress_logs_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Progress_Logs_Sub_Menu
+Test Tags      Progress_Logs_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/notices_menu/test_notices_menu.robot b/gui/gui_test/notices_menu/test_notices_menu.robot
index 6d6d0f4..d82cb91 100644
--- a/gui/gui_test/notices_menu/test_notices_menu.robot
+++ b/gui/gui_test/notices_menu/test_notices_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Notices_Menu
+Test Tags      Notices_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
index 051c758..1ed65b7 100644
--- a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Firmware_Sub_Menu
+Test Tags      Firmware_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_host_console_sub_menu.robot b/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
index 2184136..4704c55 100644
--- a/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Host_Console_Sub_Menu
+Test Tags      Host_Console_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
index 041637f..879d22e 100644
--- a/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
@@ -9,7 +9,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Reboot_BMC_Sub_Menu
+Test Tags      Reboot_BMC_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
index 805ee88..062aba6 100644
--- a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
@@ -8,7 +8,7 @@
 Test Setup      Run Keywords  Launch Browser And Login GUI  AND  Navigate to Server Power Operation Page
 Test Teardown   Close Browser
 
-Force Tags      Server_Power_Operations_Sub_Menu
+Test Tags      Server_Power_Operations_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/overview_menu/test_overview_menu.robot b/gui/gui_test/overview_menu/test_overview_menu.robot
index ac608c2..42e2406 100644
--- a/gui/gui_test/overview_menu/test_overview_menu.robot
+++ b/gui/gui_test/overview_menu/test_overview_menu.robot
@@ -13,7 +13,7 @@
 Suite Teardown  Run Keywords  Close Browser  AND  Redfish.Logout
 Test Setup      Test Setup Execution
 
-Force Tags      Overview_Menu
+Test Tags      Overview_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
index 9ef4a32..0ac420b 100644
--- a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
@@ -9,7 +9,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Certificates_Sub_Menu
+Test Tags      Certificates_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
index ceb0e45..38ce20b 100644
--- a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      LDAP_Sub_Menu
+Test Tags      LDAP_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
index def4240..43dad8b 100644
--- a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
+++ b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      Multiple_Interfaces
+Test Tags      Multiple_Interfaces
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
index 109a70f..694b49f 100644
--- a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
@@ -10,7 +10,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
-Force Tags       Policies_Sub_Menu
+Test Tags       Policies_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
index 842813b..389b92f 100644
--- a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
-Force Tags      Sessions_Sub_Menu
+Test Tags      Sessions_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
index 674e487..41bc631 100644
--- a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Suite Teardown Execution
 Test Setup      Test Setup Execution
 
-Force Tags      User_Management_Sub_Menu
+Test Tags      User_Management_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
index a8e26f1..8a66bcc 100644
--- a/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown  Suite Teardown Execution
 Test Setup      Navigate To Date and Time Page
 
-Force Tags      Date_And_Time_Sub_Menu
+Test Tags      Date_And_Time_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
index 7788951..c2c0a75 100644
--- a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
@@ -7,7 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Factory_Reset_Sub_Menu
+Test Tags      Factory_Reset_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_network_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
index 8a83246..c569cf6 100644
--- a/gui/gui_test/settings_menu/test_network_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_network_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
-Force Tags      Network_Sub_Menu
+Test Tags      Network_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
index 56a9af2..89fd2a5 100644
--- a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
@@ -8,7 +8,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
-Force Tags       Power_Restore_Policy_Sub_Menu
+Test Tags       Power_Restore_Policy_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
index e42b04c..4887faa 100644
--- a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
@@ -10,7 +10,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Run Keywords  Redfish.Logout  AND  Close Browser
 
-Force Tags      SNMP_Alerts_Sub_Menu
+Test Tags      SNMP_Alerts_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/test/access_control/test_obmc_gui_local_users.robot b/gui/test/access_control/test_obmc_gui_local_users.robot
index 444e81a..afad860 100644
--- a/gui/test/access_control/test_obmc_gui_local_users.robot
+++ b/gui/test/access_control/test_obmc_gui_local_users.robot
@@ -7,7 +7,7 @@
 Suite Setup     Launch Browser And Login OpenBMC GUI
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
-Force Tags      Obmc_Gui_Local_Users
+Test Tags      Obmc_Gui_Local_Users
 
 *** Variables ***
 
diff --git a/ipmi/dcmi/test_dcmi_asset_tag.robot b/ipmi/dcmi/test_dcmi_asset_tag.robot
index d8959c6..1b0f3ea 100644
--- a/ipmi/dcmi/test_dcmi_asset_tag.robot
+++ b/ipmi/dcmi/test_dcmi_asset_tag.robot
@@ -11,7 +11,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       DCMI_Asset_Tag
+Test Tags       DCMI_Asset_Tag
 
 *** Test Cases ***
 
diff --git a/ipmi/dcmi/test_dcmi_get_capabilities.robot b/ipmi/dcmi/test_dcmi_get_capabilities.robot
index 9b3e981..a9becc8 100644
--- a/ipmi/dcmi/test_dcmi_get_capabilities.robot
+++ b/ipmi/dcmi/test_dcmi_get_capabilities.robot
@@ -3,7 +3,7 @@
 Documentation    Module to test dcmi get capabilites functionality.
 Resource         ../../lib/ipmi_client.robot
 
-Force Tags       DCMI_Get_Capabilities
+Test Tags       DCMI_Get_Capabilities
 
 *** Variables ***
 
diff --git a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
index 1873743..2ee8810 100644
--- a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
+++ b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
@@ -15,7 +15,7 @@
 
 Suite Setup  Suite Setup Execution
 
-Force Tags       DCMI_Get_Temperature_Reading
+Test Tags       DCMI_Get_Temperature_Reading
 
 *** Variables ***
 
diff --git a/ipmi/dcmi/test_dcmi_management_controller.robot b/ipmi/dcmi/test_dcmi_management_controller.robot
index c21ee6b..5964480 100644
--- a/ipmi/dcmi/test_dcmi_management_controller.robot
+++ b/ipmi/dcmi/test_dcmi_management_controller.robot
@@ -13,7 +13,7 @@
 Library          ../../lib/utils.py
 Library          JSONLibrary
 
-Force Tags       DCMI_Management_Controller
+Test Tags       DCMI_Management_Controller
 
 *** Variables ***
 
diff --git a/ipmi/test_get_bios_post_code.robot b/ipmi/test_get_bios_post_code.robot
index 869646a..d49a6b0 100644
--- a/ipmi/test_get_bios_post_code.robot
+++ b/ipmi/test_get_bios_post_code.robot
@@ -9,7 +9,7 @@
 Suite Setup      IPMI Power On
 Suite Teardown   IPMI Power On  stack_mode=skip  quiet=1
 
-Force Tags       Get_BIOS_Post_Code
+Test Tags       Get_BIOS_Post_Code
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_chassis.robot b/ipmi/test_ipmi_chassis.robot
index 477be2a..2f0cf48 100644
--- a/ipmi/test_ipmi_chassis.robot
+++ b/ipmi/test_ipmi_chassis.robot
@@ -12,7 +12,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    Test Teardown Execution
 
-Force Tags       IPMI_Chassis
+Test Tags       IPMI_Chassis
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_cipher.robot b/ipmi/test_ipmi_cipher.robot
index d035efe..5dea4f5 100644
--- a/ipmi/test_ipmi_cipher.robot
+++ b/ipmi/test_ipmi_cipher.robot
@@ -13,7 +13,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       IPMI_Cipher
+Test Tags       IPMI_Cipher
 
 *** Variables  ***
 ${cipher_suite}      standard
diff --git a/ipmi/test_ipmi_cold_reset.robot b/ipmi/test_ipmi_cold_reset.robot
index ed3d4f2..51f5776 100644
--- a/ipmi/test_ipmi_cold_reset.robot
+++ b/ipmi/test_ipmi_cold_reset.robot
@@ -29,7 +29,7 @@
 
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          IPMI_Cold_Reset
+Test Tags          IPMI_Cold_Reset
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_device_id.robot b/ipmi/test_ipmi_device_id.robot
index 3586012..297fd64 100644
--- a/ipmi/test_ipmi_device_id.robot
+++ b/ipmi/test_ipmi_device_id.robot
@@ -21,7 +21,7 @@
 Library             ../lib/var_funcs.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
-Force Tags          IPMI_Device_ID
+Test Tags          IPMI_Device_ID
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_disable.robot b/ipmi/test_ipmi_disable.robot
index 6fd02bb..7a63548 100644
--- a/ipmi/test_ipmi_disable.robot
+++ b/ipmi/test_ipmi_disable.robot
@@ -5,7 +5,7 @@
 Resource         ../lib/openbmc_ffdc.robot
 Library          ../lib/ipmi_utils.py
 
-Force Tags       IPMI_Disable
+Test Tags       IPMI_Disable
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_fru.robot b/ipmi/test_ipmi_fru.robot
index 24f1c26..e10eb8b 100644
--- a/ipmi/test_ipmi_fru.robot
+++ b/ipmi/test_ipmi_fru.robot
@@ -10,7 +10,7 @@
 Suite Teardown         Suite Teardown Execution
 Test Teardown          Test Teardown Execution
 
-Force Tags             IPMI_FRU
+Test Tags             IPMI_FRU
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_fru_device.robot b/ipmi/test_ipmi_fru_device.robot
index d3376c5..533a95f 100644
--- a/ipmi/test_ipmi_fru_device.robot
+++ b/ipmi/test_ipmi_fru_device.robot
@@ -6,7 +6,7 @@
 Variables              ../data/ipmi_raw_cmd_table.py
 Library                ../lib/ipmi_utils.py
 
-Force Tags             IPMI_FRU_Device
+Test Tags             IPMI_FRU_Device
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index 4f9fa3b..5cede0e 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -13,7 +13,7 @@
 Suite Setup      IPMI General Test Suite Setup
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       IPMI_General
+Test Tags       IPMI_General
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_inband_sdr.robot b/ipmi/test_ipmi_inband_sdr.robot
index a6dcdcb..75f645f 100644
--- a/ipmi/test_ipmi_inband_sdr.robot
+++ b/ipmi/test_ipmi_inband_sdr.robot
@@ -16,7 +16,7 @@
 Suite Teardown         Redfish.Logout
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             IPMI_Inband_SDR
+Test Tags             IPMI_Inband_SDR
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_kcs.robot b/ipmi/test_ipmi_kcs.robot
index 0cc2ecc..64d24d0 100644
--- a/ipmi/test_ipmi_kcs.robot
+++ b/ipmi/test_ipmi_kcs.robot
@@ -9,7 +9,7 @@
 
 Suite Setup     Suite Setup Execution
 
-Force Tags      IPMI_KCS
+Test Tags      IPMI_KCS
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_lanplus.robot b/ipmi/test_ipmi_lanplus.robot
index afd82e6..34dc5fe 100644
--- a/ipmi/test_ipmi_lanplus.robot
+++ b/ipmi/test_ipmi_lanplus.robot
@@ -7,7 +7,7 @@
 Variables              ../data/ipmi_raw_cmd_table.py
 Library                ../lib/ipmi_utils.py
 
-Force Tags             IPMI_LANplus
+Test Tags             IPMI_LANplus
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_mc_id.robot b/ipmi/test_ipmi_mc_id.robot
index 4972a04..719207b 100644
--- a/ipmi/test_ipmi_mc_id.robot
+++ b/ipmi/test_ipmi_mc_id.robot
@@ -7,7 +7,7 @@
 
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       IPMI_MC_ID
+Test Tags       IPMI_MC_ID
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index 573e5eb..8da73b0 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -16,7 +16,7 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags             IPMI_Network_Configuration
+Test Tags             IPMI_Network_Configuration
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index f267d7c..5f03c33 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -14,7 +14,7 @@
 Test Setup             Printn
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             IPMI_Network_Verification
+Test Tags             IPMI_Network_Verification
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_payload.robot b/ipmi/test_ipmi_payload.robot
index 4f4b8f3..b8f7889 100644
--- a/ipmi/test_ipmi_payload.robot
+++ b/ipmi/test_ipmi_payload.robot
@@ -10,7 +10,7 @@
 Suite Setup         IPMI Payload Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          IPMI_Payload
+Test Tags          IPMI_Payload
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_poh_counter.robot b/ipmi/test_ipmi_poh_counter.robot
index 649f599..ba6fed1 100644
--- a/ipmi/test_ipmi_poh_counter.robot
+++ b/ipmi/test_ipmi_poh_counter.robot
@@ -36,7 +36,7 @@
 
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          IPMI_Poh_Counter
+Test Tags          IPMI_Poh_Counter
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_resets.robot b/ipmi/test_ipmi_resets.robot
index 1d2a2d5..b7b378d 100755
--- a/ipmi/test_ipmi_resets.robot
+++ b/ipmi/test_ipmi_resets.robot
@@ -9,7 +9,7 @@
 
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       IPMI_Resets
+Test Tags       IPMI_Resets
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index c62f554..5d27644 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -14,7 +14,7 @@
 Suite Teardown          Redfish.Logout
 Test Teardown           Test Teardown Execution
 
-Force Tags              IPMI_SDR
+Test Tags              IPMI_SDR
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_sel.robot b/ipmi/test_ipmi_sel.robot
index f31d616..77a45b3 100644
--- a/ipmi/test_ipmi_sel.robot
+++ b/ipmi/test_ipmi_sel.robot
@@ -13,7 +13,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       IPMI_SEL
+Test Tags       IPMI_SEL
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_sel_time.robot b/ipmi/test_ipmi_sel_time.robot
index b71e4d6..7d02f11 100644
--- a/ipmi/test_ipmi_sel_time.robot
+++ b/ipmi/test_ipmi_sel_time.robot
@@ -37,7 +37,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       IPMI_SEL_Time
+Test Tags       IPMI_SEL_Time
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_sensor.robot b/ipmi/test_ipmi_sensor.robot
index eb70020..666abfa 100644
--- a/ipmi/test_ipmi_sensor.robot
+++ b/ipmi/test_ipmi_sensor.robot
@@ -11,7 +11,7 @@
 Test Teardown     Run Keywords  FFDC On Test Case Fail  AND
 ...  Redfish.Logout
 
-Force Tags        IPMI_Sensor
+Test Tags        IPMI_Sensor
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index 18c08f2..b602fc4 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -12,7 +12,7 @@
 Test Setup          Start SOL Console Logging
 Test Teardown       Test Teardown Execution
 
-Force Tags          IPMI_SOL
+Test Tags          IPMI_SOL
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_systeminfo_parameters.robot b/ipmi/test_ipmi_systeminfo_parameters.robot
index 60a1d26..7865d0b 100644
--- a/ipmi/test_ipmi_systeminfo_parameters.robot
+++ b/ipmi/test_ipmi_systeminfo_parameters.robot
@@ -19,7 +19,7 @@
 Suite Setup         Suite Setup Execution
 Test Teardown       Run Keywords  Restore Default Configuration  AND  FFDC On Test Case Fail
 
-Force Tags          IPMI_SystemInfo_Parameters
+Test Tags          IPMI_SystemInfo_Parameters
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 7e2efce..9fec7f1 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -10,7 +10,7 @@
 Suite Setup         Suite Setup Execution
 Test Teardown       Test Teardown Execution
 
-Force Tags          IPMI_User
+Test Tags          IPMI_User
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_watchdog.robot b/ipmi/test_ipmi_watchdog.robot
index fd2fea0..9f0a02a 100644
--- a/ipmi/test_ipmi_watchdog.robot
+++ b/ipmi/test_ipmi_watchdog.robot
@@ -9,7 +9,7 @@
 Library          Collections
 Variables        ../data/ipmi_raw_cmd_table.py
 
-Force Tags       IPMI_Watchdog
+Test Tags       IPMI_Watchdog
 
 *** Variables ***
 
diff --git a/network/network_diagnostic_report.robot b/network/network_diagnostic_report.robot
index b081fd5..15accc0 100644
--- a/network/network_diagnostic_report.robot
+++ b/network/network_diagnostic_report.robot
@@ -7,7 +7,7 @@
 Resource      ../lib/utils.robot
 Test Setup    Check If Tool Exist
 
-Force Tags    Network_Diagnostic_Report
+Test Tags    Network_Diagnostic_Report
 
 *** Test Cases ***
 
diff --git a/network/test_bmc_dhcp_conf.robot b/network/test_bmc_dhcp_conf.robot
index 06e341b..4a99697 100644
--- a/network/test_bmc_dhcp_conf.robot
+++ b/network/test_bmc_dhcp_conf.robot
@@ -8,7 +8,7 @@
 Suite Setup            Suite Setup Execution
 Suite Teardown         Run Keywords  Restore Configuration  AND Redfish.Logout
 
-Force Tags             BMC_DHCP_Conf
+Test Tags             BMC_DHCP_Conf
 
 *** Variables ***
 
diff --git a/network/test_cable_pull_recover.robot b/network/test_cable_pull_recover.robot
index 33a92d9..d1fc2c8 100644
--- a/network/test_cable_pull_recover.robot
+++ b/network/test_cable_pull_recover.robot
@@ -21,7 +21,7 @@
 
 Suite Setup     Test Setup Execution
 
-Force Tags      Cable_Pull_Recover
+Test Tags      Cable_Pull_Recover
 
 *** Variables ***
 
diff --git a/network/test_host_network.robot b/network/test_host_network.robot
index 33cd1c2..fbb2dad 100644
--- a/network/test_host_network.robot
+++ b/network/test_host_network.robot
@@ -11,7 +11,7 @@
 Test Setup          Open Connection And Log In
 Test Teardown       Test Teardown Execution
 
-Force Tags          Host_Network
+Test Tags          Host_Network
 
 *** Variables ***
 ${SET_ADDR_PREFIX}  0x00 0x08 0x61 0x80 0x21 0x70 0x62 0x21 0x00 0x01 0x06 0x04
diff --git a/network/test_host_network_interfaces.robot b/network/test_host_network_interfaces.robot
index 24e2425..7321301 100644
--- a/network/test_host_network_interfaces.robot
+++ b/network/test_host_network_interfaces.robot
@@ -12,7 +12,7 @@
 
 Resource         ../lib/os_utils_install.robot
 
-Force Tags       Host_Network_Interfaces
+Test Tags       Host_Network_Interfaces
 
 *** Variables ***
 
diff --git a/network/test_network_nping.robot b/network/test_network_nping.robot
index 7155cc9..6d1e72a 100644
--- a/network/test_network_nping.robot
+++ b/network/test_network_nping.robot
@@ -8,7 +8,7 @@
 
 Suite Setup  Suite Setup Execution
 
-Force Tags  Network_Nping
+Test Tags  Network_Nping
 
 *** Variables ***
 
diff --git a/network/test_vlan_network.robot b/network/test_vlan_network.robot
index 8feb2fb..1b6a4c8 100644
--- a/network/test_vlan_network.robot
+++ b/network/test_vlan_network.robot
@@ -18,7 +18,7 @@
 
 Suite Teardown                  Suite Teardown Execution
 
-Force Tags                      VLAN_Network
+Test Tags                      VLAN_Network
 
 *** Variables ***
 
diff --git a/oem/nuvoton/test_ipmi_flash.robot b/oem/nuvoton/test_ipmi_flash.robot
index a69405d..8774aad 100644
--- a/oem/nuvoton/test_ipmi_flash.robot
+++ b/oem/nuvoton/test_ipmi_flash.robot
@@ -8,7 +8,7 @@
 
 Suite Setup      Suite Setup Execution
 
-Force Tags       IPMI_Flash
+Test Tags       IPMI_Flash
 
 *** Variables ***
 
diff --git a/oem/nuvoton/test_jtag_master.robot b/oem/nuvoton/test_jtag_master.robot
index 0af1054..d10fab2 100644
--- a/oem/nuvoton/test_jtag_master.robot
+++ b/oem/nuvoton/test_jtag_master.robot
@@ -4,7 +4,7 @@
 Resource         ../../lib/openbmc_ffdc.robot
 Resource         ../../lib/connection_client.robot
 
-Force Tags       JTAG_Master
+Test Tags       JTAG_Master
 
 Suite Setup      Suite Setup Execution
 
diff --git a/oem/nuvoton/test_redfish_mcu_fw_update.robot b/oem/nuvoton/test_redfish_mcu_fw_update.robot
index 67407a0..e6c01b9 100644
--- a/oem/nuvoton/test_redfish_mcu_fw_update.robot
+++ b/oem/nuvoton/test_redfish_mcu_fw_update.robot
@@ -27,7 +27,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Mcu_Code_Update
+Test Tags               Mcu_Code_Update
 
 *** Test Cases ***
 
diff --git a/openpower/ext_interfaces/test_client_identifier.robot b/openpower/ext_interfaces/test_client_identifier.robot
index 194be6a..99c9924 100644
--- a/openpower/ext_interfaces/test_client_identifier.robot
+++ b/openpower/ext_interfaces/test_client_identifier.robot
@@ -17,7 +17,7 @@
 Test Setup        Printn
 Test Teardown     FFDC On Test Case Fail
 
-Force Tags        Client_Identifier
+Test Tags        Client_Identifier
 
 *** Test Cases ***
 
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index 9fe0b70..0e29da5 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -15,7 +15,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Lock_Management
+Test Tags               Lock_Management
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 5493d62..0b669d1 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -14,7 +14,7 @@
 Test Teardown     Test Teardown Execution
 Suite Teardown    Suite Teardown Execution
 
-Force Tags        Savearea_Management
+Test Tags        Savearea_Management
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index f036d5f..c3782fb 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -8,7 +8,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmi
+Test Tags        Vmi
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot b/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
index c39497e..973f26f 100644
--- a/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
+++ b/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
@@ -10,7 +10,7 @@
 Suite Setup       Suite Setup Execution
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmi_Multiple_Interfaces
+Test Tags        Vmi_Multiple_Interfaces
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index ed3cd67..2978480 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -13,7 +13,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmicert_Management
+Test Tags        Vmicert_Management
 
 
 *** Variables ***
diff --git a/openpower/ipmi/test_ipmi_sdr.robot b/openpower/ipmi/test_ipmi_sdr.robot
index c1f9322..8fb12fa 100755
--- a/openpower/ipmi/test_ipmi_sdr.robot
+++ b/openpower/ipmi/test_ipmi_sdr.robot
@@ -11,7 +11,7 @@
 Suite Teardown          Redfish.Logout
 Test Teardown           Test Teardown Execution
 
-Force Tags              Ipmi_Sdr
+Test Tags              Ipmi_Sdr
 
 
 *** Test Cases ***
diff --git a/openpower/localuser/test_ipmi_redfish_user.robot b/openpower/localuser/test_ipmi_redfish_user.robot
index 9bdb551..f147362 100644
--- a/openpower/localuser/test_ipmi_redfish_user.robot
+++ b/openpower/localuser/test_ipmi_redfish_user.robot
@@ -12,7 +12,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       IPMI_Redfish_User
+Test Tags       IPMI_Redfish_User
 
 *** Variables ***
 
diff --git a/openpower/mpipl/test_mpipl_basic.robot b/openpower/mpipl/test_mpipl_basic.robot
index 5fd0507..6757f6f 100644
--- a/openpower/mpipl/test_mpipl_basic.robot
+++ b/openpower/mpipl/test_mpipl_basic.robot
@@ -16,7 +16,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
-Force Tags       MPIPL_Basic
+Test Tags       MPIPL_Basic
 
 *** Variables ***
 
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index aa2dbb3..6f7f8c8 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -11,7 +11,7 @@
 Test Setup      Redfish.Login
 Test Teardown   Run Keywords  Redfish.Logout  AND  FFDC On Test Case Fail
 
-Force Tags      Bmc_Pel
+Test Tags      Bmc_Pel
 
 *** Variables ***
 
diff --git a/openpower/ras/test_bmc_ras.robot b/openpower/ras/test_bmc_ras.robot
index 81c56d6..e90ac08 100755
--- a/openpower/ras/test_bmc_ras.robot
+++ b/openpower/ras/test_bmc_ras.robot
@@ -19,7 +19,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          BMC_RAS
+Test Tags          BMC_RAS
 
 *** Variables ***
 ${stack_mode}       normal
diff --git a/openpower/ras/test_host_boot_ras.robot b/openpower/ras/test_host_boot_ras.robot
index ca785c5..88f04dd 100644
--- a/openpower/ras/test_host_boot_ras.robot
+++ b/openpower/ras/test_host_boot_ras.robot
@@ -19,7 +19,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          Host_Boot_RAS
+Test Tags          Host_Boot_RAS
 
 *** Variables ***
 ${stack_mode}       normal
diff --git a/openpower/ras/test_host_ras.robot b/openpower/ras/test_host_ras.robot
index c5edd3d..28813a8 100755
--- a/openpower/ras/test_host_ras.robot
+++ b/openpower/ras/test_host_ras.robot
@@ -18,7 +18,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          Host_RAS
+Test Tags          Host_RAS
 
 *** Variables ***
 ${stack_mode}       normal
diff --git a/openpower/ras/test_reboot_ras.robot b/openpower/ras/test_reboot_ras.robot
index c031e8a..aab9130 100755
--- a/openpower/ras/test_reboot_ras.robot
+++ b/openpower/ras/test_reboot_ras.robot
@@ -14,7 +14,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          Reboot_RAS
+Test Tags          Reboot_RAS
 
 *** Test Cases ***
 Verify Host Unrecoverable Callout Handling At Reboot
diff --git a/openpower/vpd/test_vpd_tool.robot b/openpower/vpd/test_vpd_tool.robot
index 9061802..50d8934 100644
--- a/openpower/vpd/test_vpd_tool.robot
+++ b/openpower/vpd/test_vpd_tool.robot
@@ -7,7 +7,7 @@
 
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      VPD_Tool
+Test Tags      VPD_Tool
 
 *** Variables ***
 
diff --git a/pldm/test_firmware_boot_side.robot b/pldm/test_firmware_boot_side.robot
index 2763e7b..0e55717 100755
--- a/pldm/test_firmware_boot_side.robot
+++ b/pldm/test_firmware_boot_side.robot
@@ -26,7 +26,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Firmware_Boot_Side
+Test Tags       Firmware_Boot_Side
 
 *** Variables ***
 
diff --git a/pldm/test_pldm_base.robot b/pldm/test_pldm_base.robot
index 67229af..e15b83f 100644
--- a/pldm/test_pldm_base.robot
+++ b/pldm/test_pldm_base.robot
@@ -8,7 +8,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Pldm_Base
+Test Tags       Pldm_Base
 
 *** Test Cases ***
 Verify Get PLDM Types
diff --git a/pldm/test_pldm_bios.robot b/pldm/test_pldm_bios.robot
index f2f0ca8..4778626 100755
--- a/pldm/test_pldm_bios.robot
+++ b/pldm/test_pldm_bios.robot
@@ -13,7 +13,7 @@
 Suite Setup      PLDM BIOS Suite Setup
 Suite Teardown   Run Keyword And Ignore Error  PLDM BIOS Suite Cleanup
 
-Force Tags       Pldm_Bios
+Test Tags       Pldm_Bios
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_bios_attributes.robot b/pldm/test_pldm_bios_attributes.robot
index b17b2d3..a16a938 100755
--- a/pldm/test_pldm_bios_attributes.robot
+++ b/pldm/test_pldm_bios_attributes.robot
@@ -13,7 +13,7 @@
 Suite Setup      PLDM BIOS Attribute Suite Setup
 Suite Teardown   PLDM BIOS Attribute Suite Cleanup
 
-Force Tags       Pldm_Bios_Attributes
+Test Tags       Pldm_Bios_Attributes
 
 *** Variables ***
 
diff --git a/pldm/test_pldm_fru.robot b/pldm/test_pldm_fru.robot
index 55b7edc..7e07d55 100644
--- a/pldm/test_pldm_fru.robot
+++ b/pldm/test_pldm_fru.robot
@@ -9,7 +9,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Pldm_FRU
+Test Tags       Pldm_FRU
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_oem.robot b/pldm/test_pldm_oem.robot
index d44b03f..913a8ad 100644
--- a/pldm/test_pldm_oem.robot
+++ b/pldm/test_pldm_oem.robot
@@ -9,7 +9,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       Pldm_OEM
+Test Tags       Pldm_OEM
 
 *** Test Cases ***
 
diff --git a/pldm/test_pldm_platform.robot b/pldm/test_pldm_platform.robot
index fc68fb5..6453bfd 100644
--- a/pldm/test_pldm_platform.robot
+++ b/pldm/test_pldm_platform.robot
@@ -12,7 +12,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Pldmtool Platform Suite Cleanup
 
-Force Tags        Pldm_Platform
+Test Tags        Pldm_Platform
 
 *** Test Cases ***
 Verify GetPDR
diff --git a/pldm/test_redfish_bios_attributes.robot b/pldm/test_redfish_bios_attributes.robot
index 2e22fa1..e86765f 100755
--- a/pldm/test_redfish_bios_attributes.robot
+++ b/pldm/test_redfish_bios_attributes.robot
@@ -14,7 +14,7 @@
 Suite Setup      Redfish BIOS Suite Setup
 Suite Teardown   Run Keyword And Ignore Error  Redfish BIOS Suite Cleanup
 
-Force Tags       Redfish_Bios_Attributes
+Test Tags       Redfish_Bios_Attributes
 
 *** Variables ***
 
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 ***
 
diff --git a/security/test_bmc_connections.robot b/security/test_bmc_connections.robot
index e1080ac..9d1e7a9 100644
--- a/security/test_bmc_connections.robot
+++ b/security/test_bmc_connections.robot
@@ -23,7 +23,7 @@
 
 Variables     ../gui/data/gui_variables.py
 
-Force Tags    BMC_Connections
+Test Tags    BMC_Connections
 
 *** Variables ***
 
diff --git a/security/test_bmc_expire_password.robot b/security/test_bmc_expire_password.robot
index 00453f8..b7820a9 100644
--- a/security/test_bmc_expire_password.robot
+++ b/security/test_bmc_expire_password.robot
@@ -10,7 +10,7 @@
 
 Test Setup       Set Account Lockout Threshold
 
-Force Tags       BMC_Expire_Password
+Test Tags       BMC_Expire_Password
 
 *** Variables ***
 
diff --git a/security/test_bmc_network_security.robot b/security/test_bmc_network_security.robot
index 3668ef7..fc92791 100644
--- a/security/test_bmc_network_security.robot
+++ b/security/test_bmc_network_security.robot
@@ -18,7 +18,7 @@
 
 Suite Setup             Suite Setup Execution
 
-Force Tags              BMC_Network_Security
+Test Tags              BMC_Network_Security
 
 *** Variables ***
 
diff --git a/security/test_bmc_ssh_security.robot b/security/test_bmc_ssh_security.robot
index 9e63ae5..14a7b34 100644
--- a/security/test_bmc_ssh_security.robot
+++ b/security/test_bmc_ssh_security.robot
@@ -4,7 +4,7 @@
 Resource         ../lib/resource.robot
 Resource         ../lib/openbmc_ffdc_methods.robot
 
-Force Tags       BMC_SSH_Security
+Test Tags       BMC_SSH_Security
 
 *** Variables ***
 
diff --git a/security/test_bmcweb_security.robot b/security/test_bmcweb_security.robot
index 8fcaed3..5f38829 100644
--- a/security/test_bmcweb_security.robot
+++ b/security/test_bmcweb_security.robot
@@ -8,7 +8,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       BMCweb_Security
+Test Tags       BMCweb_Security
 
 *** Variables ***
 
diff --git a/security/test_slp.robot b/security/test_slp.robot
index f0892f3..2436276 100644
--- a/security/test_slp.robot
+++ b/security/test_slp.robot
@@ -9,7 +9,7 @@
 # Get the SLP services available, make it suite global.
 Suite Setup     Suite Setup Execution
 
-Force Tags  SLP_Service_Test
+Test Tags  SLP_Service_Test
 
 *** Variables ***
 ${service_types}    findsrvtypes
diff --git a/systest/gpu_stress_test.robot b/systest/gpu_stress_test.robot
index ab6d84f..697afcd 100755
--- a/systest/gpu_stress_test.robot
+++ b/systest/gpu_stress_test.robot
@@ -24,7 +24,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       GPU_Stress
+Test Tags       GPU_Stress
 
 *** Variables ****
 
diff --git a/systest/htx_hardbootme_test.robot b/systest/htx_hardbootme_test.robot
index 953441b..9e7ce18 100755
--- a/systest/htx_hardbootme_test.robot
+++ b/systest/htx_hardbootme_test.robot
@@ -51,7 +51,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags      HTX_Hardbootme
+Test Tags      HTX_Hardbootme
 
 *** Variables ****
 
diff --git a/systest/htx_softbootme_test.robot b/systest/htx_softbootme_test.robot
index a354057..a022976 100644
--- a/systest/htx_softbootme_test.robot
+++ b/systest/htx_softbootme_test.robot
@@ -22,7 +22,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags      HTX_Softbootme
+Test Tags      HTX_Softbootme
 
 *** Variables ****
 
diff --git a/systest/network_stability_test.robot b/systest/network_stability_test.robot
index 6f52ff0..af2daca 100755
--- a/systest/network_stability_test.robot
+++ b/systest/network_stability_test.robot
@@ -8,7 +8,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags      Network_Stability
+Test Tags      Network_Stability
 
 *** Variables ****
 
diff --git a/systest/proc_freq_check.robot b/systest/proc_freq_check.robot
index 9c93a8b..ce1ac97 100755
--- a/systest/proc_freq_check.robot
+++ b/systest/proc_freq_check.robot
@@ -14,7 +14,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       Proc_Freq_Check
+Test Tags       Proc_Freq_Check
 
 *** Test Cases ***
 
diff --git a/systest/test_bmc_poll_errors.robot b/systest/test_bmc_poll_errors.robot
index edf26af..b904518 100755
--- a/systest/test_bmc_poll_errors.robot
+++ b/systest/test_bmc_poll_errors.robot
@@ -12,7 +12,7 @@
 Suite Setup       Suite Setup Execution
 Test Teardown     Post Test Case Execution
 
-Force Tags        BMC_Poll_Errors
+Test Tags        BMC_Poll_Errors
 
 *** Variables ***
 
diff --git a/systest/test_boot_acceptance.robot b/systest/test_boot_acceptance.robot
index e4659c8..9fb76ce 100644
--- a/systest/test_boot_acceptance.robot
+++ b/systest/test_boot_acceptance.robot
@@ -49,7 +49,7 @@
 Suite Teardown  Collect HTX Log Files
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      Boot_Acceptance
+Test Tags      Boot_Acceptance
 
 *** Variables ***