diff --git a/tests/test_association.robot b/tests/test_association.robot
index b348e38..d2162ab 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -74,10 +74,11 @@
     Should Contain     ${dimm1_event}    ${log_list[0]}
 
 
-Create error log on two FRU
+Create Error Log On Two FRU
     [Documentation]     ***GOOD PATH***
     ...                 Create an error log on two FRUs and verify
     ...                 its association.\n
+    [Tags]  Create_Error_Log_On_Two_FRU
 
     ${log_uri}=      Create a test log
     ${association_uri}=    catenate    SEPARATOR=   ${log_uri}   /fru
@@ -93,10 +94,11 @@
     Should Contain     ${dimm2_event}    ${log_uri}
 
 
-Create multiple error logs
+Create Multiple Error Logs
     [Documentation]     ***GOOD PATH***
     ...                 Create multiple error logs and verify
     ...                 their association.\n
+    [Tags]  Create_Multiple_Error_Logs
 
     : FOR    ${INDEX}    IN RANGE    1    4
     \    Log    ${INDEX}
@@ -138,10 +140,11 @@
     Should Not Contain     ${dimm2_event}    ${log_uri1}
 
 
-Association with invalid FRU
+Association With Invalid FRU
     [Documentation]     ***BAD PATH***
     ...                 Create an error log on invalid FRU and verify
     ...                 that its does not have any association.\n
+    [Tags]  Association_With_Invalid_FRU
 
     Run Keyword And Continue On Failure   Clear all logs
 
@@ -161,10 +164,11 @@
     Should Contain     ${jsondata['message']}    404 Not Found
 
 
-Assocition with no FRU error event
+Association With No FRU Error Event
     [Documentation]     ***BAD PATH***
     ...                 Create an error log on no FRU and verify
     ...                 that its does not have any association.\n
+    [Tags]  Association_With_No_FRU_Error_Event
 
     Run Keyword And Continue On Failure   Clear all logs
 
@@ -188,7 +192,7 @@
     [Documentation]     ***GOOD PATH***
     ...                 Create an error log on virtual sensor and
     ...                 verify its association.\n
-    [Tags]              Association_with_virtual_sensor
+    [Tags]  Association_With_Virtual_Sensor
 
     Run Keyword And Continue On Failure   Clear all logs
 
@@ -209,7 +213,7 @@
     ...  ${association_content}
     ...  ${OPENBMC_BASE_URI}inventory/system/systemevent
 
-Association unchanged after reboot
+Association Unchanged After Reboot
     [Documentation]     ***GOOD PATH***
     ...                 This test case is to verify that error log association
     ...                 does not change after open bmc reboot.\n
diff --git a/tests/test_boot.robot b/tests/test_boot.robot
index 95f1696..e417ce8 100644
--- a/tests/test_boot.robot
+++ b/tests/test_boot.robot
@@ -18,9 +18,10 @@
 
 *** Test Cases ***
 
-Set the Boot Device as Default using REST API
+Set The Boot Device As Default Using REST API
    [Documentation]   This testcase is to set the boot device as Default using REST
    ...               URI. The Boot device is read using REST API and ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Default_Using_REST_API
 
     ${bootDevice}=   Set Variable   Default
     ${valueDict}=   create dictionary   data=${bootDevice}
@@ -31,10 +32,11 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   Default
 
-Set the Boot Device as Default using ipmitool
+Set The Boot Device As Default Using Ipmitool
    [Documentation]   This testcase is to set the boot device as Default using
    ...               ipmitool. The Boot device is read using REST API and
    ...               ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Default_Using_Ipmitool
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x00 0x00 0x00 0x00
     Read the Attribute   ${HOST_SETTINGS}   boot_flags
@@ -43,9 +45,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   Default
 
-Set the Boot Device as Network using REST API
+Set The Boot Device As Network Using REST API
    [Documentation]   This testcase is to set the boot device as Network using REST
    ...               URI. The Boot device is read using REST API and ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Network_Using_REST_API
 
     ${bootDevice}=   Set Variable   Network
     ${valueDict}=   create dictionary   data=${bootDevice}
@@ -56,10 +59,11 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}    Network
 
-Set the Boot Device as Network using ipmitool
+Set The Boot Device As Network Using Ipmitool
    [Documentation]   This testcase is to set the boot device as Network using
    ...               ipmitool. The Boot device is read using REST API and
    ...               ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Network_Using_Ipmitool
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x04 0x00 0x00 0x00
     Read the Attribute   ${HOST_SETTINGS}   boot_flags
@@ -68,9 +72,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}    Network
 
-Set the Boot Device as Disk using REST API
+Set The Boot Device As Disk Using REST API
    [Documentation]   This testcase is to set the boot device as Disk using REST
    ...               URI. The Boot device is read using REST API and ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Disk_Using_REST_API
 
     ${bootDevice}=   Set Variable   Disk
     ${valueDict}=   create dictionary   data=${bootDevice}
@@ -81,10 +86,11 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}    Disk
 
-Set the Boot Device as Disk using ipmitool
+Set The Boot Device As Disk Using Ipmitool
    [Documentation]   This testcase is to set the boot device as Disk using
    ...               ipmitool. The Boot device is read using REST API and
    ...               ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Disk_Using_Ipmitool
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x08 0x00 0x00 0x00
     Read the Attribute   ${HOST_SETTINGS}   boot_flags
@@ -93,9 +99,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}    Disk
 
-Set the Boot Device as Safe using REST API
+Set The Boot Device As Safe Using REST API
    [Documentation]   This testcase is to set the boot device as Safe using REST
    ...               URI. The Boot device is read using REST API and ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Safe_Using_REST_API
 
     ${bootDevice}=   Set Variable   Safe
     ${valueDict}=   create dictionary   data=${bootDevice}
@@ -106,10 +113,11 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   Safe
 
-Set the Boot Device as Safe using ipmitool
+Set The Boot Device As Safe Using Ipmitool
    [Documentation]   This testcase is to set the boot device as Safe using
    ...               ipmitool. The Boot device is read using REST API and
    ...               ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Safe_Using_Ipmitool
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x0C 0x00 0x00 0x00
     Read the Attribute   ${HOST_SETTINGS}   boot_flags
@@ -118,9 +126,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   Safe
 
-Set the Boot Device as CDROM using REST API
+Set The Boot Device As CDROM Using REST API
    [Documentation]   This testcase is to set the boot device as CDROM using REST
    ...               URI. The Boot device is read using REST API and ipmitool.
+   [Tags]  Set_The_Boot_Device_As_CDROM_Using_REST_API
 
     ${bootDevice}=   Set Variable   CDROM
     ${valueDict}=   create dictionary   data=${bootDevice}
@@ -131,10 +140,11 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   CDROM
 
-Set the Boot Device as CDROM using ipmitool
+Set The Boot Device As CDROM Using Ipmitool
    [Documentation]   This testcase is to set the boot device as CDROM using
    ...               ipmitool. The Boot device is read using REST API and
    ...               ipmitool.
+   [Tags]  Set_The_Boot_Device_As_CDROM_Using_Ipmitool
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x14 0x00 0x00 0x00
     Read the Attribute   ${HOST_SETTINGS}   boot_flags
@@ -143,9 +153,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   CDROM
 
-Set the Boot Device as Setup using REST API
+Set The Boot Device As Setup Using REST API
    [Documentation]   This testcase is to set the boot device as Setup using REST
    ...               URI. The Boot device is read using REST API and ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Setup_Using_REST_API
 
     ${bootDevice}=   Set Variable   Setup
     ${valueDict}=   create dictionary   data=${bootDevice}
@@ -156,10 +167,11 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}   Setup
 
-Set the Boot Device as Setup using ipmitool
+Set The Boot Device As Setup Using Ipmitool
    [Documentation]   This testcase is to set the boot device as Setup using
    ...               ipmitool. The Boot device is read using REST API and
    ...               ipmitool.
+   [Tags]  Set_The_Boot_Device_As_Setup_Using_Ipmitool
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x18 0x00 0x00 0x00
     Read the Attribute   ${HOST_SETTINGS}   boot_flags
@@ -178,5 +190,3 @@
     [Arguments]    ${uri}    ${parm}
     ${output}=     Read Attribute      ${uri}    ${parm}
     set test variable    ${OUTPUT}     ${output}
-
-
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index 93b5147..d07f7f0 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -17,9 +17,10 @@
 
 *** Test Cases ***
 
-Set Onetime boot policy using REST
+Set Onetime Boot Policy Using REST
     [Documentation]   This testcase is to set onetime boot policy using REST
     ...               URI and then verify using REST API and ipmitool.\n
+    [Tags]  Set_Onetime_Boot_Policy_Using_REST
 
     Set Boot Policy   ONETIME
 
@@ -29,9 +30,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}    ONETIME
 
-Set Permanent boot policy using REST
+Set Permanent Boot Policy Using REST
     [Documentation]   This testcase is to set permanent boot policy using REST
     ...               URI and then verify using REST API and ipmitool.\n
+    [Tags]  Set_Permanent_boot_policy_using_REST
 
     Set Boot Policy   PERMANENT
 
@@ -41,9 +43,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}     PERMANENT
 
-Set Onetime boot policy using IPMITOOL
+Set Permanent Boot Policy Using IPMITOOL
     [Documentation]   This testcase is to set boot policy to onetime boot using ipmitool
     ...               and then verify using REST URI and ipmitool.\n
+    [Tags]  Set_Permanent_Boot_Policy_Using_IPMITOOL
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x00 0x00 0x00 0x00
     ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
@@ -52,9 +55,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}    ONETIME
 
-Set Permanent boot policy using IPMITOOL
+Set Permanent Boot Policy Using IPMITOOL
     [Documentation]   This testcase is to set boot policy to permanent using ipmitool
     ...               and then verify using REST URI and ipmitool.
+    [Tags]  Set_Permanent_Boot_Policy_Using_IPMITOOL
 
     Run IPMI command   0x0 0x8 0x05 0xC0 0x00 0x00 0x00 0x00
     ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
@@ -63,10 +67,10 @@
     Should Be Empty     ${stderr}
     Should Contain   ${output}     PERMANENT
 
-Boot order with permanent boot policy
+Boot Order With Permanent Boot Policy
     [Documentation]   This testcase is to verify that boot order does not change
     ...               after first boot when boot policy set to permanent
-    [Tags]  chassisboot
+    [Tags]  chassisboot  Boot_Order_With_Permanent_Boot_Policy
 
     Initiate Power Off
 
@@ -120,10 +124,10 @@
     ${flag}=   Read Attribute  ${HOST_SETTINGS}   boot_flags
     Should Be Equal    ${flag}    CDROM
 
-Set boot policy to invalid value
+Set Boot Policy To Invalid Value
     [Documentation]   This testcase verify that the boot policy doesn't get
     ...               updated with invalid policy supplied by user.
-    [Tags]  Set_boot_policy_to_invalid_value
+    [Tags]  Set_Boot_Policy_To_Invalid_Value
 
     Run Keyword and Ignore Error    Set Boot Policy   abc