diff --git a/tests/obmc_boot_test.robot b/tests/obmc_boot_test.robot
index b7664bd..5accb0b 100644
--- a/tests/obmc_boot_test.robot
+++ b/tests/obmc_boot_test.robot
@@ -11,6 +11,7 @@
 *** Test Cases ***
 Repeated Testing
     [Documentation]  Performs random, repeated IPLs.
+    [Tags]  Repeated_Testing
 
     # Call the Main keyword to prevent any dots from appearing in the console
     # due to top level keywords.
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index fa64ae8..380a11f 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -15,7 +15,7 @@
 
 Suite setup        setup the suite
 
-Force Tags  chassisboot
+Force Tags  chassisboot  inventory
 
 *** Test Cases ***
 
diff --git a/tests/test_occ_powercap.robot b/tests/test_occ_powercap.robot
index 3cc7b64..d008ebc 100644
--- a/tests/test_occ_powercap.robot
+++ b/tests/test_occ_powercap.robot
@@ -10,11 +10,14 @@
 Suite Setup             Check OCC Readiness
 Test Teardown           Log FFDC
 
+Force Tags   powercapping
+
 *** Test Cases ***
 
 Get OCC status
     [Documentation]     This testcase is to test the OCCstatus for the system
     ...                 is Enabled or not
+    [Tags]  Get_OCC_status
     ${status}=  Get OCC status
     Should Be Equal     ${status}   Enabled
 
@@ -83,6 +86,7 @@
 Get System Power Consumption
     [Documentation]   Get the current system power consumption and check if the
     ...               value is greater than zero
+    [Tags]  Get_System_Power_Consumption
 
     ${resp} =   OpenBMC Get Request   /org/openbmc/sensors/powercap/system_power
     should be equal as strings   ${resp.status_code}   ${HTTP_OK}