diff --git a/tests/security/test_ssl.robot b/tests/security/test_ssl.robot
index bed46a6..76a145c 100644
--- a/tests/security/test_ssl.robot
+++ b/tests/security/test_ssl.robot
@@ -11,6 +11,7 @@
 Test SSL Connection
     [Documentation]     This testcase is for testing the SSL connection to the
     ...     OpenBMC machine.
+    [Tags]  Test_SSL_Connection
     Create Session    openbmc    https://${OPENBMC_HOST}/
     ${headers}=     Create Dictionary   Content-Type=application/json
     @{credentials} =   Create List     ${OPENBMC_USERNAME}      ${OPENBMC_PASSWORD}
@@ -25,6 +26,7 @@
     [Documentation]     This testcase is for test to check OpenBMC machine
     ...     will not accepts the non-secure connection that is with http to
     ...     port 80 and expect a connection error
+    [Tags]  Test_non_SSL_Connection_to_port_80
     Create Session    openbmc    http://${OPENBMC_HOST}/    timeout=3
     Run Keyword And Expect Error    ConnectionError*   Get Request    openbmc   /list
 
diff --git a/tests/test_association.robot b/tests/test_association.robot
index 8ca51e5..86c98cc 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -41,6 +41,7 @@
     [Documentation]     ***GOOD PATH***
     ...                 Create an error log on single FRU and verify
     ...                 its association.\n
+    [Tags]  Create_error_log_on_single_FRU
 
     Clear all logs
 
@@ -100,6 +101,7 @@
     [Documentation]     ***BAD PATH***
     ...                 Delete an error log and verify that its 
     ...                 association is also removed.\n
+    [Tags]  Delete_error_log
 
     ${log_uri1} =      Create a test log
     ${association_uri1} =    catenate    SEPARATOR=   ${log_uri1}   /fru
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index e3f15ca..76976ec 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -11,6 +11,7 @@
 
 power on test
     [Documentation]    Power OFF and power ON
+    [Tags]  power_on_test
 
     BMC Power Off
     BMC Power On
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index 2e6d979..44cf8f5 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -28,7 +28,7 @@
 
 clear any logs
     [Documentation]     Test delete all events
-    [Tags]  CI
+    [Tags]  CI  clear_any_logs
     ${resp} =   openbmc post request     /org/openbmc/records/events/action/clear    data=${NIL}
     should be equal as strings      ${resp.status_code}     ${HTTP_OK}
     ${resp} =   openbmc get request     /org/openbmc/records/events/
@@ -37,7 +37,7 @@
 
 write a log
     [Documentation]     Test create event
-    [Tags]  CI
+    [Tags]  CI  write_a_log
     create a test log
 
 Message attribute should match
diff --git a/tests/test_obmcrest.robot b/tests/test_obmcrest.robot
index 329578a..91512aa 100644
--- a/tests/test_obmcrest.robot
+++ b/tests/test_obmcrest.robot
@@ -1,9 +1,9 @@
 *** Settings ***
-Documentation		This suite will verifiy all OpenBMC rest interfaces
-...					Details of valid interfaces can be found here...
-...					https://github.com/openbmc/docs/blob/master/rest-api.md
+Documentation     This suite will verifiy all OpenBMC rest interfaces
+...               Details of valid interfaces can be found here...
+...               https://github.com/openbmc/docs/blob/master/rest-api.md
 
-Resource	  	  ../lib/rest_client.robot
+Resource          ../lib/rest_client.robot
 Resource          ../lib/openbmc_ffdc.robot
 Test Teardown     Log FFDC
 
@@ -13,7 +13,7 @@
 
 *** Test Cases ***
 Good connection for testing
-    [Tags]  CI
+    [Tags]  CI  Good_connection_for_testing
     ${content}=    Read Properties     /
     ${c}=          get from List       ${content}      0
     Should Be Equal    ${c}     /org
@@ -33,7 +33,7 @@
     Should Be Equal     ${jsondata['data']['description']}      The specified property cannot be found: ''is_fru''
 
 get directory listing /
-    [Tags]  CI
+    [Tags]  CI  get_directory_listing
     ${resp} =   openbmc get request     /
     should be equal as strings      ${resp.status_code}     ${HTTP_OK}
     ${json} =   to json     ${resp.content}