diff --git a/tests/test_fw_version.robot b/tests/test_fw_version.robot
index 953aa4f..c66a1d7 100755
--- a/tests/test_fw_version.robot
+++ b/tests/test_fw_version.robot
@@ -28,7 +28,7 @@
     ...     open-power-barreleye-v1.8
     ...     $
 
-    [Tags]  chassisboot
+    [Tags]  chassisboot    Test_BIOS_Version
     ${resp} =    OpenBMC Get Request    /org/openbmc/inventory/system/bios
     Should Be Equal As Strings    ${resp.status_code}    ${HTTP_OK}
     ${jsondata}=    To Json    ${resp.content}
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index 7542778..fa64ae8 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -24,6 +24,8 @@
     Should Be True     ${count}>${0}
 
 minimal dimm inventory
+    [Tags]  minimal_dimm_inventory
+
     ${count} =     Get Total Present     dimm
     Should Be True     ${count}>=${2}
 
@@ -58,6 +60,8 @@
     Verify Properties     CPU
 
 Verify DIMM VPD Properties
+    [Tags]    Verify_DIMM_VPD_Properties
+
     Verify Properties     DIMM
 
 Verify Memory Buffer VPD Properties
diff --git a/tests/test_obmcrest.robot b/tests/test_obmcrest.robot
index 91512aa..7f90206 100644
--- a/tests/test_obmcrest.robot
+++ b/tests/test_obmcrest.robot
@@ -23,6 +23,7 @@
     Should Be Empty     ${content}
 
 Get a Property
+    [Tags]  Get_a_Property
     ${resp}=   Read Attribute      /org/openbmc/inventory/system/chassis/motherboard/cpu0      is_fru
     Should Be Equal    ${resp}     ${1}
 
diff --git a/tests/test_occ_powercap.robot b/tests/test_occ_powercap.robot
index 31471f9..3cc7b64 100644
--- a/tests/test_occ_powercap.robot
+++ b/tests/test_occ_powercap.robot
@@ -70,6 +70,8 @@
 Disable PowerCap
     [Documentation]     Test set powercap with 0 and make sure powercap is
     ...                 disabled by checking whether the value is set to 0
+    [Tags]  Disable_PowerCap
+
     ${resp}=  Set PowerCap    ${0}
     should be equal as strings      ${resp.status_code}     ${HTTP_OK}
     Sleep   ${DBUS_POLL_INTERVAL}
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 34ad450..36095c3 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -167,6 +167,8 @@
     Response Should Be Equal    False
 
 DIMM3 Present
+    [Tags]    DIMM3_Present
+
     ${uri} =    Get System component    dimm3
     ${x} =      Get Inventory Sensor Number   ${uri}
 
@@ -175,6 +177,8 @@
     Response Should Be Equal    True
 
 DIMM3 not Present
+    [Tags]    DIMM3_not_Present
+
     ${uri} =    Get System component    dimm3
     ${x} =      Get Inventory Sensor Number   ${uri}
 
@@ -183,6 +187,7 @@
     Response Should Be Equal    False
 
 DIMM0 fault
+    [Tags]    DIMM0_fault
     ${uri} =    Get System component    dimm0
     ${x} =      Get Inventory Sensor Number   ${uri}
 
@@ -191,6 +196,7 @@
     Response Should Be Equal    True
 
 DIMM0 no fault
+    [Tags]    DIMM0_no_fault
     ${uri} =    Get System component    dimm0
     ${x} =      Get Inventory Sensor Number   ${uri}