diff --git a/redfish/managers/test_managers_bmc.robot b/redfish/managers/test_managers_bmc.robot
index 6d5e35f..8aa917d 100644
--- a/redfish/managers/test_managers_bmc.robot
+++ b/redfish/managers/test_managers_bmc.robot
@@ -7,9 +7,9 @@
 
 *** Test Cases ***
 
-Verify BMC Firmware Version
+Verify Redfish BMC Firmware Version
     [Documentation]  Get firmware version from BMC manager.
-    [Tags]  Verify_BMC_Firmware_Version
+    [Tags]  Verify_Redfish_BMC_Firmware_Version
 
     redfish.Login
     ${resp}=  redfish.Get  /redfish/v1/Managers/bmc
@@ -20,9 +20,9 @@
     redfish.Logout
 
 
-Verify BMC Manager Properties
+Verify Redfish BMC Manager Properties
     [Documentation]  Verify BMC managers resource properties.
-    [Tags]  Verify_BMC_Manager_Properties
+    [Tags]  Verify_Redfish_BMC_Manager_Properties
 
     redfish.Login
     ${resp}=  redfish.Get  /redfish/v1/Managers/bmc
@@ -45,9 +45,9 @@
     redfish.Logout
 
 
-Test BMC Manager GracefulRestart
+Test Redfish BMC Manager GracefulRestart
     [Documentation]  BMC graceful restart.
-    [Tags]  Test_BMC_Manager_GracefulRestart
+    [Tags]  Test_Redfish_BMC_Manager_GracefulRestart
 
     # Example:
     # "Actions": {
diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index 5957336..a5df8c7 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -4,17 +4,17 @@
 
 *** Test Cases ***
 
-Login And Logout BMCweb
+Redfish Login And Logout
     [Documentation]  Login to BMCweb and then logout.
-    [Tags]  Login_And_Logout_BMCweb
+    [Tags]  Redfish_Login_And_Logout
 
     redfish.Login
     redfish.Logout
 
 
-GET BMCweb Hypermedia Without Login
+GET Redfish Hypermedia Without Login
     [Documentation]  GET hypermedia URL without login.
-    [Tags]  GET_BMCweb_Hypermedia_Without_Login
+    [Tags]  GET_Redfish_Hypermedia_Without_Login
     [Template]  GET And Verify Redfish Response
 
     # Expect status      Resource URL Path
@@ -23,9 +23,9 @@
     ${HTTP_OK}           /redfish/v1
 
 
-GET SessionService Resource With Login
+GET Redfish SessionService Resource With Login
     [Documentation]  Login to BMCweb and get /redfish/v1/SessionService.
-    [Tags]  GET_SessionService_Resource_With_Login
+    [Tags]  GET_Redfish_SessionService_Resource_With_Login
 
     redfish.Login
     ${resp}=  redfish.Get  /redfish/v1/SessionService
@@ -33,17 +33,17 @@
     redfish.Logout
 
 
-GET SessionService Without Login
+GET Redfish SessionService Without Login
     [Documentation]  Get /redfish/v1/SessionService without login
-    [Tags]  GET_SessionService_Without_Login
+    [Tags]  GET_Redfish_SessionService_Without_Login
 
     ${resp}=  redfish.Get  /redfish/v1/SessionService
     Should Be Equal As Strings  ${resp.status}  ${HTTP_UNAUTHORIZED}
 
 
-Login Using Invalid Token
+Redfish Login Using Invalid Token
     [Documentation]  Login to BMCweb with invalid token.
-    [Tags]  Login_Using_Invalid_Token
+    [Tags]  Redfish_Login_Using_Invalid_Token
 
     Create Session  openbmc  ${AUTH_URI}
 
@@ -57,9 +57,9 @@
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_UNAUTHORIZED}
 
 
-Delete Session Using Valid login
+Delete Redfish Session Using Valid login
     [Documentation]  Delete a session using valid login.
-    [Tags]  Delete_Session_Using_Valid_Login
+    [Tags]  Delete_Redfish_Session_Using_Valid_Login
 
     redfish.Login
 
diff --git a/redfish/service_root/test_service_root_security.robot b/redfish/service_root/test_service_root_security.robot
index a5ec38d..285f5da 100644
--- a/redfish/service_root/test_service_root_security.robot
+++ b/redfish/service_root/test_service_root_security.robot
@@ -4,9 +4,9 @@
 
 *** Test Cases ***
 
-Login To BMCweb With Invalid Credentials
+Redfish Login With Invalid Credentials
     [Documentation]  Login to BMC web using invalid credential.
-    [Tags]  Login_To_BMCweb_With_Invalid_Credentials
+    [Tags]  Redfish_Login_With_Invalid_Credentials
     [Template]  Login And Verify Redfish Response
 
     # Expect status            Username               Password
@@ -17,9 +17,9 @@
     InvalidCredentialsError*   ${EMPTY}               ${EMPTY}
 
 
-Login To BMCweb Using Unsecured HTTP
+Redfish Login Using Unsecured HTTP
     [Documentation]  Login to BMC web through http unsecured.
-    [Tags]  Login_To_BMCweb_Using_Unsecured_HTTP
+    [Tags]  Redfish_Login_Using_Unsecured_HTTP
 
     Create Session  openbmc  http://${OPENBMC_HOST}
     ${data}=  Create Dictionary
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index 5fbdcf5..4e062b6 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -4,7 +4,7 @@
 
 *** Test Cases ***
 
-Verify Update Service Enabled
+Verify Redfish Update Service Enabled
     [Documentation]  Verify "ServiceEnabled" is enabled.
     [Tags]  Verify_Update_Service_Enabled
 
@@ -21,9 +21,9 @@
     redfish.Logout
 
 
-Verify Software Inventory Collection
+Verify Redfish Software Inventory Collection
     [Documentation]  Verify software inventory collection member and object entries.
-    [Tags]  Verify_Software_Inventory_Collection
+    [Tags]  Verify_Redfish_Software_Inventory_Collection
 
     # Example:
     # {
@@ -52,9 +52,9 @@
     redfish.Logout
 
 
-Software Inventory Status Check
+Redfish Software Inventory Status Check
     [Documentation]  Get firmware inventory entries and do health check status.
-    [Tags]  Software_Inventory_Status_Check
+    [Tags]  Redfish_Software_Inventory_Status_Check
 
     redfish.Login
     ${resp}=  redfish.Get  /redfish/v1/UpdateService/FirmwareInventory
diff --git a/test_lists/HW_CI b/test_lists/HW_CI
index 6d29e31..4c009f0 100644
--- a/test_lists/HW_CI
+++ b/test_lists/HW_CI
@@ -1,4 +1,4 @@
-# rsyslog test.
+#rsyslog test.
 -i Test_Remote_Logging_Configuration
 #Verify SSH and IPMI interfaces
 -i Test_SSH_And_IPMI_Connections
@@ -23,5 +23,18 @@
 -i REST_Logout_Session_To_BMC
 #Verify system boot time average
 -i Verify_Uptime_Average_Against_Threshold
-# Check for BMC dump.
+#Check for BMC dump.
 -i Verify_No_BMC_Dump
+#Redfish tests cases.
+-i Redfish_Login_And_Logout
+-i GET_Redfish_Hypermedia_Without_Login
+-i GET_Redfish_SessionService_Resource_With_Login
+-i GET_Redfish_SessionService_Without_Login
+-i Redfish_Login_Using_Invalid_Token
+-i Delete_Redfish_Session_Using_Valid_Login
+-i Redfish_Login_With_Invalid_Credentials
+-i Redfish_Login_Using_Unsecured_HTTP
+-i Verify_Update_Service_Enabled
+-i Verify_Redfish_Software_Inventory_Collection
+-i Redfish_Software_Inventory_Status_Check
+-i Verify_Redfish_BMC_Manager_Properties