diff --git a/ipmi/dcmi/test_dcmi_asset_tag.robot b/ipmi/dcmi/test_dcmi_asset_tag.robot
index 02462fd..3456afd 100644
--- a/ipmi/dcmi/test_dcmi_asset_tag.robot
+++ b/ipmi/dcmi/test_dcmi_asset_tag.robot
@@ -11,6 +11,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    FFDC On Test Case Fail
 
+Force 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 25d7a89..b7df1f3 100644
--- a/ipmi/dcmi/test_dcmi_get_capabilities.robot
+++ b/ipmi/dcmi/test_dcmi_get_capabilities.robot
@@ -3,7 +3,10 @@
 Documentation    Module to test dcmi get capabilites functionality.
 Resource         ../../lib/ipmi_client.robot
 
+Force Tags       DCMI_Get_Capabilities
+
 *** Variables ***
+
 @{slave_address_list}  Slave address of device: 0h (8bits)(Satellite/External controller)
 ...                    Slave address of device: 20h (BMC)
 
@@ -43,4 +46,4 @@
       Exit For Loop IF  ${slave_address_status} == True
     END
 
-    Run Keyword IF  ${slave_address_status} == False  Fail  msg=Slave address is showing wrongly.
\ No newline at end of file
+    Run Keyword IF  ${slave_address_status} == False  Fail  msg=Slave address is showing wrongly.
diff --git a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
index a27d188..5e3357e 100644
--- a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
+++ b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
@@ -15,7 +15,10 @@
 
 Suite Setup  Suite Setup Execution
 
+Force Tags       DCMI_Get_Temperature_Reading
+
 *** Variables ***
+
 ${config_file_name}             dcmi_sensors.json
 ${dcmi_sensors_info_json_file}  /usr/share/ipmi-providers/${config_file_name}
 ${client_config_file_path}      ${EXEC_DIR}/${config_file_name}
diff --git a/ipmi/dcmi/test_dcmi_management_controller.robot b/ipmi/dcmi/test_dcmi_management_controller.robot
index a0810fd..e32c79c 100644
--- a/ipmi/dcmi/test_dcmi_management_controller.robot
+++ b/ipmi/dcmi/test_dcmi_management_controller.robot
@@ -13,7 +13,10 @@
 Library          ../../lib/utils.py
 Library          JSONLibrary
 
+Force Tags       DCMI_Management_Controller
+
 *** Variables ***
+
 ${hostname_file_path}  /etc/hostname
 
 *** Test Cases ***
diff --git a/ipmi/test_get_bios_post_code.robot b/ipmi/test_get_bios_post_code.robot
index be93139..169f2c7 100644
--- a/ipmi/test_get_bios_post_code.robot
+++ b/ipmi/test_get_bios_post_code.robot
@@ -6,10 +6,13 @@
 Library          ../lib/ipmi_utils.py
 Variables        ../data/ipmi_raw_cmd_table.py
 
-Suite Setup  IPMI Power On
-Suite Teardown  IPMI Power On  stack_mode=skip  quiet=1
+Suite Setup      IPMI Power On
+Suite Teardown   IPMI Power On  stack_mode=skip  quiet=1
+
+Force Tags       Get_BIOS_Post_Code
 
 *** Test Cases ***
+
 Test Get BIOS POST Code via IPMI Raw Command
     [Documentation]  Get BIOS POST Code via IPMI raw command.
     [Tags]  Test_Get_BIOS_POST_Code_via_IPMI_Raw_Command
diff --git a/ipmi/test_ipmi_chassis.robot b/ipmi/test_ipmi_chassis.robot
index 1c9f030..ddf4ce4 100644
--- a/ipmi/test_ipmi_chassis.robot
+++ b/ipmi/test_ipmi_chassis.robot
@@ -12,6 +12,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    Test Teardown Execution
 
+Force Tags       IPMI_Chassis
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_cipher.robot b/ipmi/test_ipmi_cipher.robot
index 0c869df..21e2b61 100644
--- a/ipmi/test_ipmi_cipher.robot
+++ b/ipmi/test_ipmi_cipher.robot
@@ -13,6 +13,7 @@
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_Cipher
 
 *** Variables  ***
 ${cipher_suite}      standard
diff --git a/ipmi/test_ipmi_cold_reset.robot b/ipmi/test_ipmi_cold_reset.robot
index e13a000..1a4b5d9 100644
--- a/ipmi/test_ipmi_cold_reset.robot
+++ b/ipmi/test_ipmi_cold_reset.robot
@@ -29,6 +29,7 @@
 
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags          IPMI_Cold_Reset
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_device_id.robot b/ipmi/test_ipmi_device_id.robot
index 3769842..ea0f3be 100644
--- a/ipmi/test_ipmi_device_id.robot
+++ b/ipmi/test_ipmi_device_id.robot
@@ -21,6 +21,7 @@
 Library             ../lib/var_funcs.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
+Force Tags          IPMI_Device_ID
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_disable.robot b/ipmi/test_ipmi_disable.robot
index e0f382a..c97573e 100644
--- a/ipmi/test_ipmi_disable.robot
+++ b/ipmi/test_ipmi_disable.robot
@@ -5,6 +5,8 @@
 Resource         ../lib/openbmc_ffdc.robot
 Library          ../lib/ipmi_utils.py
 
+Force Tags       IPMI_Disable
+
 *** Test Cases ***
 
 Verify Disabling And Enabling IPMI Via Host
diff --git a/ipmi/test_ipmi_fru.robot b/ipmi/test_ipmi_fru.robot
index c088a66..24f1c26 100644
--- a/ipmi/test_ipmi_fru.robot
+++ b/ipmi/test_ipmi_fru.robot
@@ -10,8 +10,10 @@
 Suite Teardown         Suite Teardown Execution
 Test Teardown          Test Teardown Execution
 
+Force Tags             IPMI_FRU
 
 *** Variables ***
+
 &{ipmi_redfish_fru_field_map}  product_serial=SerialNumber  product_part_number=PartNumber
 
 *** Test Cases ***
diff --git a/ipmi/test_ipmi_fru_device.robot b/ipmi/test_ipmi_fru_device.robot
index 5ed37b7..dee7595 100644
--- a/ipmi/test_ipmi_fru_device.robot
+++ b/ipmi/test_ipmi_fru_device.robot
@@ -6,7 +6,10 @@
 Variables              ../data/ipmi_raw_cmd_table.py
 Library                ../lib/ipmi_utils.py
 
+Force Tags             IPMI_FRU_Device
+
 *** Variables ***
+
 ${FRU_NAME}       dimm01 dimm02 cpu0 cpu1  motherboard
 ${BUSCTL_FRU}                xyz.openbmc_project.FruDevice
 ${FRU_DBUS_URL}              /xyz/openbmc_project/FruDevice
@@ -390,4 +393,4 @@
     Write FRU Data Via IPMI  ${fru_device_id}  ${read_write_offset}  ${fru_byte}  ${initial_frulength_hex}
     # Verify whether initial FRU data is restored.
     ${fru_data}=  Read FRU Data Via IPMI  ${fru_device_id}  ${read_write_offset}
-    Should Be Equal  ${fru_data}  ${initial_fru_data}
\ No newline at end of file
+    Should Be Equal  ${fru_data}  ${initial_fru_data}
diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index b53005a..eb665a4 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -12,6 +12,8 @@
 Suite Setup      IPMI General Test Suite Setup
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_General
+
 *** Test Cases ***
 
 Test Get Self Test Results via IPMI Raw Command
diff --git a/ipmi/test_ipmi_inband_sdr.robot b/ipmi/test_ipmi_inband_sdr.robot
index 2e438a0..3462e22 100644
--- a/ipmi/test_ipmi_inband_sdr.robot
+++ b/ipmi/test_ipmi_inband_sdr.robot
@@ -16,8 +16,7 @@
 Suite Teardown         Redfish.Logout
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             Ipmi_Inband_Sdr
-
+Force Tags             IPMI_Inband_SDR
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_kcs.robot b/ipmi/test_ipmi_kcs.robot
index bfb7169..0cc2ecc 100644
--- a/ipmi/test_ipmi_kcs.robot
+++ b/ipmi/test_ipmi_kcs.robot
@@ -1,17 +1,18 @@
 *** Settings ***
 
-Documentation          To Verify KCS interface.
+Documentation   To Verify KCS interface.
 
-Resource               ../lib/ipmi_client.robot
-Resource               ../lib/ipmi_utils.robot
-Variables              ../data/ipmi_raw_cmd_table.py
-Library                ../lib/ipmi_utils.py
-
+Resource        ../lib/ipmi_client.robot
+Resource        ../lib/ipmi_utils.robot
+Variables       ../data/ipmi_raw_cmd_table.py
+Library         ../lib/ipmi_utils.py
 
 Suite Setup     Suite Setup Execution
 
+Force Tags      IPMI_KCS
 
 *** Variables ***
+
 ${LOOP_COUNT}          ${1}
 
 
diff --git a/ipmi/test_ipmi_lanplus.robot b/ipmi/test_ipmi_lanplus.robot
index 24aac0b..afd82e6 100644
--- a/ipmi/test_ipmi_lanplus.robot
+++ b/ipmi/test_ipmi_lanplus.robot
@@ -7,7 +7,10 @@
 Variables              ../data/ipmi_raw_cmd_table.py
 Library                ../lib/ipmi_utils.py
 
+Force Tags             IPMI_LANplus
+
 *** Variables ***
+
 ${LOOP_COUNT}          ${1}
 
 
diff --git a/ipmi/test_ipmi_mc_id.robot b/ipmi/test_ipmi_mc_id.robot
index 2133b25..4972a04 100644
--- a/ipmi/test_ipmi_mc_id.robot
+++ b/ipmi/test_ipmi_mc_id.robot
@@ -7,6 +7,7 @@
 
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_MC_ID
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index f645b46..6066103 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -15,10 +15,10 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags             Ipmi_Network_Configuration
-
+Force Tags             IPMI_Network_Configuration
 
 *** Variables ***
+
 ${vlan_id_for_ipmi}     ${10}
 @{vlan_ids}             ${20}  ${30}
 ${interface}            eth0
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index 11d99d5..bc06034 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -14,10 +14,10 @@
 Test Setup             Printn
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             Ipmi_Network_Verification
-
+Force Tags             IPMI_Network_Verification
 
 *** Variables ***
+
 ${set_mac_address}                      02:f4:43:24:e7:1a
 ${Invalid_mac_address}                  11:f4:43:24:e7:1a
 
diff --git a/ipmi/test_ipmi_payload.robot b/ipmi/test_ipmi_payload.robot
index b4ff0c7..dcab815 100644
--- a/ipmi/test_ipmi_payload.robot
+++ b/ipmi/test_ipmi_payload.robot
@@ -7,12 +7,13 @@
 Variables           ../data/ipmi_raw_cmd_table.py
 Library             ../lib/ipmi_utils.py
 
-
 Suite Setup         IPMI Payload Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags          IPMI_Payload
 
 *** Variables ***
+
 ${user_priv}                     2
 ${operator_priv}                 3
 ${admin_level_priv}              4
diff --git a/ipmi/test_ipmi_poh_counter.robot b/ipmi/test_ipmi_poh_counter.robot
index b664a85..ae17bf9 100644
--- a/ipmi/test_ipmi_poh_counter.robot
+++ b/ipmi/test_ipmi_poh_counter.robot
@@ -31,11 +31,12 @@
 Library             ../lib/ipmi_utils.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
-Suite Setup      Suite Setup Execution
-Suite Teardown   Suite Teardown Execution
+Suite Setup         Suite Setup Execution
+Suite Teardown      Suite Teardown Execution
 
-Test Teardown    FFDC On Test Case Fail
+Test Teardown       FFDC On Test Case Fail
 
+Force Tags          IPMI_Poh_Counter
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_resets.robot b/ipmi/test_ipmi_resets.robot
index 38fc96c..1d2a2d5 100755
--- a/ipmi/test_ipmi_resets.robot
+++ b/ipmi/test_ipmi_resets.robot
@@ -9,6 +9,8 @@
 
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_Resets
+
 *** Variables ***
 
 # User may pass LOOP_COUNT.
diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index b176368..4577dda 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -14,8 +14,7 @@
 Suite Teardown          Redfish.Logout
 Test Teardown           Test Teardown Execution
 
-Force Tags              Ipmi_Sdr
-
+Force Tags              IPMI_SDR
 
 *** Test Cases ***
 
diff --git a/ipmi/test_ipmi_sel.robot b/ipmi/test_ipmi_sel.robot
index 189660d..8b201ea 100644
--- a/ipmi/test_ipmi_sel.robot
+++ b/ipmi/test_ipmi_sel.robot
@@ -9,6 +9,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       IPMI_SEL
+
 *** Variables ***
 
 # Based on 13th byte of add SEL entry command as per IPMI spec
diff --git a/ipmi/test_ipmi_sel_time.robot b/ipmi/test_ipmi_sel_time.robot
index 089ee70..d60dcdd 100644
--- a/ipmi/test_ipmi_sel_time.robot
+++ b/ipmi/test_ipmi_sel_time.robot
@@ -37,6 +37,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Force Tags       IPMI_SEL_Time
+
 *** Variables ***
 
 ${NETWORK_RESTART_TIME}   5s
diff --git a/ipmi/test_ipmi_sensor.robot b/ipmi/test_ipmi_sensor.robot
index a4254c2..6a312c5 100644
--- a/ipmi/test_ipmi_sensor.robot
+++ b/ipmi/test_ipmi_sensor.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation  Validate IPMI sensor IDs using Redfish.
+Documentation     Validate IPMI sensor IDs using Redfish.
 
 Resource          ../lib/ipmi_client.robot
 Resource          ../lib/openbmc_ffdc.robot
@@ -11,8 +11,10 @@
 Test Teardown     Run Keywords  FFDC On Test Case Fail  AND
 ...  Redfish.Logout
 
+Force Tags        IPMI_Sensor
 
 *** Variables ***
+
 ${allowed_temp_diff}    ${2}
 ${allowed_power_diff}   ${10}
 
diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index f13a212..5bf83bc 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -12,8 +12,7 @@
 Test Setup          Start SOL Console Logging
 Test Teardown       Test Teardown Execution
 
-Force Tags          Ipmi_Sol
-
+Force Tags          IPMI_SOL
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_systeminfo_parameters.robot b/ipmi/test_ipmi_systeminfo_parameters.robot
index 9c3aef0..94a3673 100644
--- a/ipmi/test_ipmi_systeminfo_parameters.robot
+++ b/ipmi/test_ipmi_systeminfo_parameters.robot
@@ -19,6 +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
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 9b020c8..be63b6e 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -10,6 +10,8 @@
 Suite Setup         Suite Setup Execution
 Test Teardown       Test Teardown Execution
 
+Force Tags          IPMI_User
+
 *** Variables ***
 
 ${invalid_username}     user%
diff --git a/ipmi/test_ipmi_watchdog.robot b/ipmi/test_ipmi_watchdog.robot
index bb776ba..37e353f 100644
--- a/ipmi/test_ipmi_watchdog.robot
+++ b/ipmi/test_ipmi_watchdog.robot
@@ -9,6 +9,8 @@
 Library          Collections
 Variables        ../data/ipmi_raw_cmd_table.py
 
+Force Tags       IPMI_Watchdog
+
 *** Variables ***
 
 ${TIMER_DELAY}          3