diff --git a/redfish/account_service/test_ipmi_redfish_user.robot b/redfish/account_service/test_ipmi_redfish_user.robot
index 0e95921..d2e12c3 100644
--- a/redfish/account_service/test_ipmi_redfish_user.robot
+++ b/redfish/account_service/test_ipmi_redfish_user.robot
@@ -10,6 +10,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Test Teardown    IPMI_Redfish_User
 
 *** Variables ***
 
@@ -325,6 +326,7 @@
 
 Find Free User Id
     [Documentation]  Find a userid that is not being used.
+
     FOR    ${jj}    IN RANGE    300
         # IPMI maximum users count (i.e. 15 users).
         ${random_userid}=  Evaluate  random.randint(1, ${ipmi_max_num_users})  modules=random
diff --git a/redfish/account_service/test_redfish_privilege_registry.robot b/redfish/account_service/test_redfish_privilege_registry.robot
index 5225162..8401cca 100644
--- a/redfish/account_service/test_redfish_privilege_registry.robot
+++ b/redfish/account_service/test_redfish_privilege_registry.robot
@@ -11,6 +11,8 @@
 Suite Teardown   Delete Created Redfish Users Except Default Admin
 Test Teardown    Redfish.Logout
 
+Test Tags        Redfish_Privilege_Registry
+
 *** Variables ***
 
 ${test_user}           testuser
@@ -26,7 +28,7 @@
 ${post_password}       postpassword
 ${account_service}     ${2}
 
-** Test Cases **
+*** Test Cases ***
 
 Verify Redfish Privilege Registry Properties
     [Documentation]  Verify the Redfish Privilege Registry properties.
diff --git a/redfish/account_service/test_user_account.robot b/redfish/account_service/test_user_account.robot
index 93f4e6e..15463db 100644
--- a/redfish/account_service/test_user_account.robot
+++ b/redfish/account_service/test_user_account.robot
@@ -11,6 +11,8 @@
 Test Setup       Redfish.Login
 Test Teardown    Test Teardown Execution
 
+Test Tags        User_Account
+
 *** Variables ***
 
 ${account_lockout_duration}   ${30}
diff --git a/redfish/dmtf_tools/Redfish_Interop_Validator.robot b/redfish/dmtf_tools/Redfish_Interop_Validator.robot
index 6cf32e8..9be6e20 100644
--- a/redfish/dmtf_tools/Redfish_Interop_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Interop_Validator.robot
@@ -7,6 +7,8 @@
 
 Resource           ../../lib/dmtf_tools_utils.robot
 
+Test Tags          Redfish_Interop_Validator
+
 *** Variables ***
 
 ${DEFAULT_PYTHON}  python3
diff --git a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
index ad6ad22..3a85d09 100644
--- a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
+++ b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
@@ -6,6 +6,8 @@
 Resource          ../../lib/dmtf_tools_utils.robot
 Resource          ../../lib/bmc_redfish_resource.robot
 
+Test Tags         Redfish_JsonSchema_ResponseValidator
+
 *** Variables ***
 
 ${DEFAULT_PYTHON}  python3
diff --git a/redfish/dmtf_tools/Redfish_Protocol_Validator.robot b/redfish/dmtf_tools/Redfish_Protocol_Validator.robot
index 0fa27dc..fbd8538 100644
--- a/redfish/dmtf_tools/Redfish_Protocol_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Protocol_Validator.robot
@@ -8,6 +8,8 @@
 
 Test Setup                Test Setup Execution
 
+Test Tags                 Redfish_Protocol_Validator
+
 *** Variables ***
 
 ${DEFAULT_PYTHON}         python3
diff --git a/redfish/dmtf_tools/Redfish_Reference_Checker.robot b/redfish/dmtf_tools/Redfish_Reference_Checker.robot
index 1fcef8f..e0f5c61 100644
--- a/redfish/dmtf_tools/Redfish_Reference_Checker.robot
+++ b/redfish/dmtf_tools/Redfish_Reference_Checker.robot
@@ -8,6 +8,8 @@
 
 Test Setup                Test Setup Execution
 
+Test Tags                 Redfish_Reference_Checker
+
 *** Variables ***
 
 ${DEFAULT_PYTHON}         python3
diff --git a/redfish/dmtf_tools/Redfish_Service_Validator.robot b/redfish/dmtf_tools/Redfish_Service_Validator.robot
index a6983e4..ce6539f 100644
--- a/redfish/dmtf_tools/Redfish_Service_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Service_Validator.robot
@@ -8,6 +8,8 @@
 Resource           ../../lib/bmc_redfish_resource.robot
 Resource           ../../lib/bmc_redfish_utils.robot
 
+Test Tags          Redfish_Service_Validator
+
 *** Variables ***
 
 ${DEFAULT_PYTHON}  python3
diff --git a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
index 4908488..fdaa82c 100644
--- a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
+++ b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
@@ -11,6 +11,8 @@
 Test Setup                Test Setup Execution
 Test Teardown             Test Teardown Execution
 
+Test Tags                 Redfish_Usecase_Checkers
+
 *** Variables ***
 
 ${DEFAULT_PYTHON}         python3