diff --git a/extended/factory_reset.robot b/extended/factory_reset.robot
index 43e693f..2b8562a 100644
--- a/extended/factory_reset.robot
+++ b/extended/factory_reset.robot
@@ -18,7 +18,7 @@
     [Documentation]  Factory reset the system and verify if BMC is online.
     [Tags]  Verify_Factory_Reset
 
-    # Factory reset erases user config settings which incldes IP, netmask
+    # Factory reset erases user config settings which includes IP, netmask
     # gateway and route. Before running this test we are checking all these
     # settings and checking whether ping works with BMC host.
     # If factory reset is successful, ping to BMC host should fail as
diff --git a/extended/obmc_boot_test.robot b/extended/obmc_boot_test.robot
index 7259051..c82fa8a 100644
--- a/extended/obmc_boot_test.robot
+++ b/extended/obmc_boot_test.robot
@@ -3,9 +3,9 @@
 
 Resource  obmc_boot_test_resource.robot
 
-*** Variables ***
 
 *** Test Cases ***
+
 General Boot Testing
     [Documentation]  Performs repeated boot tests.
     [Tags]  General_Boot_Testing
diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index 84d8f8c..65e66d6 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -17,7 +17,9 @@
 
 Test OpenBMC Buster
     [Documentation]  Test the OpenBMC buster.
-    Validate Parameters
+    [Tags]  Test_OpenBMC_Buster
+
+    Validate PDU Parameters
     ${output}=  Execute Command
     ...  find /var/lib -type f |xargs -n 1 touch
     PDU Power Cycle
@@ -32,8 +34,9 @@
 
 *** Keywords ***
 
-Validate Parameters
+Validate PDU Parameters
     [Documentation]  Validate the PDU parameters.
+
     Should Not Be Empty  ${PDU_IP}
     Should Not Be Empty  ${PDU_TYPE}
     Should Not Be Empty  ${PDU_SLOT_NO}
diff --git a/extended/test_bmc_stress_buster.robot b/extended/test_bmc_stress_buster.robot
index 025e4e1..ad5a71b 100644
--- a/extended/test_bmc_stress_buster.robot
+++ b/extended/test_bmc_stress_buster.robot
@@ -34,6 +34,7 @@
 Stress BMC SSH Server
     [Documentation]  Execute maximum allowed SSH operation.
     [Tags]  Stress_BMC_SSH_Server
+
     Log To Console  SSH call request burst ${SSH_BUSTER_MAX}
     ${dict}=  Execute Process
     ...  ${SSH_BUSTER_MAX}  SSH Connect And Execute Command
@@ -44,6 +45,7 @@
 Stress BMC IPMI Server
     [Documentation]  Execute maximum allowed IPMI operation.
     [Tags]  Stress_BMC_IPMI_Server
+
     Log To Console  IPMI call request burst ${IPMI_BUSTER_MAX}
     ${dict}=  Execute Process  ${IPMI_BUSTER_MAX}  IPMI Check Status
     Dictionary Should Not Contain Value  ${dict}  False
diff --git a/tools/cleanup_bmc.robot b/tools/cleanup_bmc.robot
index 6c7c84d..90e206c 100755
--- a/tools/cleanup_bmc.robot
+++ b/tools/cleanup_bmc.robot
@@ -7,5 +7,6 @@
 
 Cleanup User Patches
     [Documentation]  Do the cleanup in cleanup directory path.
+    [Tags]  Cleanup_User_Patches
 
     Cleanup Dir
diff --git a/tools/factory_reset_bmc.robot b/tools/factory_reset_bmc.robot
index abd7ec8..2adc3ef 100755
--- a/tools/factory_reset_bmc.robot
+++ b/tools/factory_reset_bmc.robot
@@ -26,6 +26,7 @@
 
 Factory Reset BMC
     [Documentation]  Factory reset BMC and verify BMC comes back online.
+    [Tags]  Factory_Reset_BMC
 
     BMC Execute Command  /usr/bin/hostnamectl set-hostname ${OPENBMC_MODEL}
     BMC Execute Command  /sbin/fw_setenv rwreset true
@@ -45,6 +46,7 @@
 
 Test Setup Execution
     [Documentation]  Check if parameters are provided.
+
     Should Not Be Empty   ${OPENBMC_SERIAL_HOST}
     Should Not Be Empty   ${OPENBMC_SERIAL_PORT}
     Should Not Be Empty   ${OPENBMC_MODEL}
diff --git a/tools/myffdc.robot b/tools/myffdc.robot
index 63bf1a1..73d65e4 100755
--- a/tools/myffdc.robot
+++ b/tools/myffdc.robot
@@ -37,6 +37,8 @@
 My FFDC Logs
     [Documentation]  This test is needed to satisfy FFDC initial setup auto
     ...              variables required for FFDC collection.
+    [Tags]  My_FFDC_Logs
+
     Log To Console   Manual FFDC collection
 
 ** Keywords ***
diff --git a/tools/update_mac.robot b/tools/update_mac.robot
index baba2a5..b076b3f 100755
--- a/tools/update_mac.robot
+++ b/tools/update_mac.robot
@@ -7,5 +7,6 @@
 
 Check And Reset MAC on BMC
     [Documentation]  Verify and Update BMC MAC address.
+    [Tags]  Check_And_Reset_MAC_on_BMC
 
     Check And Reset MAC