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