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 ***