diff --git a/redfish/extended/redfish_host_code_update.robot b/redfish/extended/redfish_host_code_update.robot
index c492f00..e80adc0 100644
--- a/redfish/extended/redfish_host_code_update.robot
+++ b/redfish/extended/redfish_host_code_update.robot
@@ -29,6 +29,8 @@
 # Force the test to timedout to prevent test hanging.
 Test Timeout             30 minutes
 
+Test Tags                Host_Code_Update
+
 *** Test Cases ***
 
 Redfish Host Code Update
diff --git a/redfish/extended/test_basic_ci.robot b/redfish/extended/test_basic_ci.robot
index e4f0396..956b596 100644
--- a/redfish/extended/test_basic_ci.robot
+++ b/redfish/extended/test_basic_ci.robot
@@ -12,6 +12,8 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
+Test Tags           Basic_CI
+
 *** Variables ***
 
 # Error strings to check from journald.
diff --git a/redfish/extended/test_bmc_file_mirroring.robot b/redfish/extended/test_bmc_file_mirroring.robot
index 5870740..903a374 100755
--- a/redfish/extended/test_bmc_file_mirroring.robot
+++ b/redfish/extended/test_bmc_file_mirroring.robot
@@ -9,6 +9,8 @@
 
 Test Teardown  Test Teardown Execution
 
+Test Tags      BMC_File_Mirroring
+
 *** Test Cases ***
 
 Test BMC Alt Side Mirroring
diff --git a/redfish/extended/test_escale_base.robot b/redfish/extended/test_escale_base.robot
index e97ab7f..7c38cf0 100755
--- a/redfish/extended/test_escale_base.robot
+++ b/redfish/extended/test_escale_base.robot
@@ -16,6 +16,7 @@
 Suite Setup      Suite Setup Execution
 Test Teardown    Test Teardown Execution
 
+Test Tags        Escale_Base
 
 *** Variables ****
 
diff --git a/redfish/extended/test_fan_operation.robot b/redfish/extended/test_fan_operation.robot
index 8501c38..6c59a60 100755
--- a/redfish/extended/test_fan_operation.robot
+++ b/redfish/extended/test_fan_operation.robot
@@ -17,6 +17,7 @@
 Suite Setup     Suite Setup Execution
 Test Teardown   Test Teardown Execution
 
+Test Tags       Fan_Operations
 
 *** Test Cases ***
 
diff --git a/redfish/extended/test_os_reboot.robot b/redfish/extended/test_os_reboot.robot
index 9855787..69fdd74 100644
--- a/redfish/extended/test_os_reboot.robot
+++ b/redfish/extended/test_os_reboot.robot
@@ -9,6 +9,8 @@
 Test Setup      Redfish.Login
 Test Teardown   Test Teardown Execution
 
+Test Tags       OS_Reboot
+
 *** Variables ***
 
 # User defined boot test iteration.
diff --git a/redfish/extended/test_power_capping.robot b/redfish/extended/test_power_capping.robot
index 99b1583..e46623f 100644
--- a/redfish/extended/test_power_capping.robot
+++ b/redfish/extended/test_power_capping.robot
@@ -18,7 +18,7 @@
 Suite Setup      Suite Setup Execution
 Test Teardown    Test Teardown Execution
 
-
+Test Tags        Power_Capping
 
 *** Variables ****
 
diff --git a/redfish/extended/test_power_restore.robot b/redfish/extended/test_power_restore.robot
index aac2614..9a6412e 100644
--- a/redfish/extended/test_power_restore.robot
+++ b/redfish/extended/test_power_restore.robot
@@ -19,7 +19,6 @@
 
 Test Tags      Power_Restore
 
-*** Variables ***
 
 *** Test Cases ***
 
diff --git a/redfish/extended/test_service_restart_policy.robot b/redfish/extended/test_service_restart_policy.robot
index d6f9dfb..3c33d92 100644
--- a/redfish/extended/test_service_restart_policy.robot
+++ b/redfish/extended/test_service_restart_policy.robot
@@ -12,6 +12,8 @@
 Suite Teardown   Close All Connections
 Test Teardown    FFDC On Test Case Fail
 
+Test Tags        Server_Restart_Policy
+
 *** Variables ***
 ${LOG_SERVICE}  xyz.openbmc_project.Logging.service
 
diff --git a/redfish/extended/test_websocket.robot b/redfish/extended/test_websocket.robot
index d74494e..517ae42 100755
--- a/redfish/extended/test_websocket.robot
+++ b/redfish/extended/test_websocket.robot
@@ -23,6 +23,7 @@
 Suite Teardown       Suite Teardown Execution
 Test Teardown        Test Teardown Execution
 
+Test Tags            Test_Websocket
 
 *** Variables ***