diff --git a/tests/test_esel.robot b/tests/test_esel.robot
index 739d37c..c45e29c 100644
--- a/tests/test_esel.robot
+++ b/tests/test_esel.robot
@@ -41,6 +41,7 @@
 
 Clear Test File
    [Documentation]   Clear /tmp/esel
+   [Tags]  Clear_Test_File
 
    Execute Command   rm /tmp/esel
    Execute Command   sync
diff --git a/tests/test_fw_version.robot b/tests/test_fw_version.robot
index 3cc59cd..53de619 100755
--- a/tests/test_fw_version.robot
+++ b/tests/test_fw_version.robot
@@ -16,6 +16,8 @@
     ...     $ git describe --dirty
     ...     v0.1-34-g95f7347
     ...     $
+    [Tags]  Test_BMC_Version
+
     ${resp}=    OpenBMC Get Request
     ...   ${INVENTORY_URI}system/chassis/motherboard/bmc
     Should Be Equal As Strings    ${resp.status_code}    ${HTTP_OK}
@@ -28,8 +30,8 @@
     ...     Expected in following format:
     ...     open-power-barreleye-v1.8
     ...     $
-
     [Tags]  chassisboot    Test_BIOS_Version
+
     ${resp}=    OpenBMC Get Request    ${INVENTORY_URI}system/bios
     Should Be Equal As Strings    ${resp.status_code}    ${HTTP_OK}
     ${jsondata}=    To Json    ${resp.content}
diff --git a/tests/test_generic_conf.robot b/tests/test_generic_conf.robot
index 8a6a5c0..7ba12fd 100755
--- a/tests/test_generic_conf.robot
+++ b/tests/test_generic_conf.robot
@@ -20,20 +20,21 @@
 *** Test Cases ***
 
 
-Get the boot_flags
+Get Boot Flags
 
     [Documentation]   ***GOOD PATH***
     ...               This test case tries to get the boot flags
-    ...
+    [Tags]  Get_Boot_Flags
 
     ${resp}=   Read Attribute   ${SETTING_HOST}   boot_flags
     should not be empty   ${resp}
 
-Get the power
+Get Power Value
 
     [Documentation]   ***GOOD PATH***
     ...               This test case tries to get the power value and it should be
     ...               between ${MIN_POWER_VALUE} and ${MAX_POWER_VALUE}
+    [Tags]  Get_Power_Value
 
     ${powerValue}=   Read Attribute   ${SETTING_HOST}   power_cap
     should be true   ${powerValue} >= ${MIN_POWER_VALUE} and ${powerValue} <= ${MAX_POWER_VALUE}
@@ -66,11 +67,12 @@
     Should Not Be Equal  ${value}  ${valueToBeSet}
 
 
-Set the power with MIN_POWER_VALUE
+Set Power With Min Power Value
 
     [Documentation]   ***BAD PATH***
     ...               This test case sets the power value less then
     ...               MIN_ALLOWED_VALUE,Expectation is it should get error.
+    [Tags]  Set_Power_With_Min_Power_Value
 
     ${valueToBeSet}=   Set Variable     ${MIN_POWER_VALUE}
     ${valueDict}=   create dictionary   data=${valueToBeSet}
@@ -78,11 +80,12 @@
     ${value}=      Read Attribute   ${SETTING_HOST}    power_cap
     Should Be Equal     ${value}      ${valueToBeSet}
 
-Set the power with MAX_POWER_VALUE
+Set Power With Max Power Value
 
     [Documentation]   ***GOOD PATH***
     ...               This test case sets the power value with MAX_POWER_VALUE
     ...               and it should be set.
+    [Tags]  Set_Power_With_Max_Power_Value
 
     ${valueToBeSet}=   Set Variable     ${MAX_POWER_VALUE}
     ${valueDict}=   create dictionary   data=${valueToBeSet}
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 699d857..8f805c4 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -28,7 +28,9 @@
     Run IPMI command            0x06 0x36
     response Should Be Equal    " 01 40 40 0a 01"
 
-Execute Set Sensor boot count
+Execute Set Sensor Boot Count
+    [Tags]  Execute_Set_Sensor_Boot_Count
+
     ${uri}=    Get System component    BootCount
     ${x}=      Get Sensor Number   ${uri}
 
@@ -37,7 +39,9 @@
     ${val}=     convert to integer    53
     Response Should Be Equal   ${val}
 
-Set Sensor Boot progress
+Set Sensor Boot Progress
+    [Tags]  Set_Sensor_Boot_Progress
+
     ${uri}=    Get System component    BootProgress
     ${x}=      Get Sensor Number   ${uri}
 
@@ -45,7 +49,8 @@
     Read the Attribute  ${uri}    value
     Response Should Be Equal    FW Progress, Baseboard Init
 
-Set Sensor Boot progress Longest string
+Set Sensor Boot Progress Longest String
+    [Tags]  Set_Sensor_Boot_Progress_Longest_String
     ${uri}=    Get System component    BootProgress
     ${x}=      Get Sensor Number   ${uri}
 
@@ -53,7 +58,9 @@
     Read The Attribute  ${uri}    value
     Response Should Be Equal    FW Progress, Docking station attachment
 
-BootProgress sensor FW Hang unspecified Error
+Boot Progress Sensor FW Hang Unspecified Error
+    [Tags]  Boot_Progress_Sensor_FW_Hang_Unspecified_Error
+
     ${uri}=    Get System component    BootProgress
     ${x}=      Get Sensor Number   ${uri}
 
@@ -61,7 +68,9 @@
     Read The Attribute  ${uri}    value
     Response Should Be Equal    FW Hang, Unspecified
 
-BootProgress fw hang state
+Boot Progress FW Hang State
+    [Tags]  Boot_Progress_FW_Hang_State
+
     ${uri}=    Get System component    BootProgress
     ${x}=      Get Sensor Number   ${uri}
 
@@ -69,7 +78,9 @@
     Read The Attribute  ${uri}    value
     Response Should Be Equal    POST Error, unknown
 
-OperatingSystemStatus Sensor boot completed progress
+OS Status Sensor Boot Completed Progress
+    [Tags]  OS_Status_Sensor_Boot_Completed_Progress
+
     ${uri}=    Get System component    OperatingSystemStatus
     ${x}=      Get Sensor Number   ${uri}
 
@@ -77,7 +88,9 @@
     Read The Attribute  ${uri}     value
     Response Should Be Equal    Boot completed (00)
 
-OperatingSystemStatus Sensor progress
+OS Status Sensor Progress
+    [Tags]  OS_Status_Sensor_Progress
+
     ${uri}=    Get System component    OperatingSystemStatus
     ${x}=      Get Sensor Number   ${uri}
 
@@ -85,7 +98,9 @@
     Read The Attribute  ${uri}     value
     Response Should Be Equal    PXE boot completed
 
-OCC Active sensor on enabled
+OCC Active Sensor On Enabled
+    [Tags]  OCC_Active_Sensor_On_Enabled
+
     ${uri}=    Get System component    OccStatus
     ${x}=      Get Sensor Number   ${uri}
 
@@ -93,7 +108,9 @@
     Read The Attribute  ${uri}     value
     Response Should Be Equal    Enabled
 
-OCC Active sensor on disabled
+OCC Active Sensor On Disabled
+    [Tags]  OCC_Active_Sensor_On_Disabled
+
     ${uri}=    Get System component    OccStatus
     ${x}=      Get Sensor Number   ${uri}
 
@@ -102,6 +119,7 @@
     Response Should Be Equal    Disabled
 
 CPU Present
+    [Tags]  CPU_Present
 
     ${uri}=    Get System component    cpu
     ${x}=      Get Inventory Sensor Number   ${uri}
@@ -110,7 +128,9 @@
     Read The Attribute  ${uri}    present
     Response Should Be Equal    True
 
-CPU not Present
+CPU Not Present
+    [Tags]  CPU_Not_Present
+
     ${uri}=    Get System component    cpu
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -118,7 +138,9 @@
     Read The Attribute  ${uri}    present
     Response Should Be Equal    False
 
-CPU fault
+CPU Fault
+    [Tags]  CPU_Fault
+
     ${uri}=    Get System component    cpu
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -126,7 +148,9 @@
     Read The Attribute  ${uri}    fault
     Response Should Be Equal    True
 
-CPU no fault
+CPU No Fault
+    [Tags]  CPU_No_Fault
+
     ${uri}=    Get System component    cpu
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -134,7 +158,9 @@
     Read The Attribute  ${uri}    fault
     Response Should Be Equal    False
 
-core Present
+Core Present
+    [Tags]  Core_Present
+
     ${uri}=    Get System component    core11
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -142,7 +168,9 @@
     Read The Attribute  ${uri}   present
     Response Should Be Equal    True
 
-core not Present
+Core Not Present
+    [Tags]  Core_Not_Present
+
     ${uri}=    Get System component    core11
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -150,7 +178,9 @@
     Read The Attribute  ${uri}   present
     Response Should Be Equal    False
 
-core fault
+Core Fault
+    [Tags]  Core_Fault
+
     ${uri}=    Get System component    core11
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -158,7 +188,9 @@
     Read The Attribute  ${uri}    fault
     Response Should Be Equal    True
 
-core no fault
+Core No Fault
+    [Tags]  Core_No_Fault
+
     ${uri}=    Get System component    core11
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -205,7 +237,7 @@
     Response Should Be Equal    False
 
 Centaur0 Present
-    [Tags]    Centaur0_Present
+    [Tags]  Centaur0_Present
 
     ${uri}=    Get System component    membuf
     ${x}=      Get Inventory Sensor Number   ${uri}
@@ -215,7 +247,7 @@
     Response Should Be Equal    True
 
 Centaur0 not Present
-    [Tags]    Centaur0_not_Present
+    [Tags]  Centaur0_not_Present
 
     ${uri}=    Get System component    membuf
     ${x}=      Get Inventory Sensor Number   ${uri}
@@ -224,7 +256,9 @@
     Read The Attribute   ${uri}    present
     Response Should Be Equal    False
 
-Centaur0 fault
+Centaur0 Fault
+    [Tags]  Centaur0_Fault
+
     ${uri}=    Get System component    membuf
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -232,7 +266,9 @@
     Read The Attribute   ${uri}    fault
     Response Should Be Equal    True
 
-Centaur0 no fault
+Centaur0 No Fault
+    [Tags]  Centaur0_No_Fault
+
     ${uri}=    Get System component    membuf
     ${x}=      Get Inventory Sensor Number   ${uri}
 
@@ -241,19 +277,20 @@
     Response Should Be Equal    False
 
 System Present
-    [Tags]    System_Present
+    [Tags]  System_Present
 
     ${uri}=    Get System component    system
     Read The Attribute   ${uri}    present
     Response Should Be Equal    True
 
 System Fault
+    [Tags]  System_Fault
     ${uri}=    Get System component    system
     Read The Attribute   ${uri}    fault
     Response Should Be Equal    False
 
 Chassis Present
-    [Tags]    Chassis_Present
+    [Tags]  Chassis_Present
 
     ${uri}=    Get System component    chassis
     Read The Attribute
@@ -261,6 +298,7 @@
     Response Should Be Equal    True
 
 Chassis Fault
+    [Tags]  Chassis_Fault
     ${uri}=    Get System component    chassis
     Read The Attribute
     ...   ${INVENTORY_URI}system/chassis    fault