diff --git a/tests/security/test_ssl.robot b/tests/security/test_ssl.robot
index 0085f26..4dfe19e 100644
--- a/tests/security/test_ssl.robot
+++ b/tests/security/test_ssl.robot
@@ -14,14 +14,14 @@
     [Tags]  Test_SSL_Connection
     Initialize OpenBMC
 
-Test Non-SSL Connection To Port 80
+Test Non SSL Connection To Port 80
     [Documentation]  Test that OpenBMC machine does not accept the non-secure
     ...  http connection at port 80 and would expect a connection error.
     [Tags]  Test_Non_SSL_Connection_To_Port_80
     Create Session  openbmc  http://${OPENBMC_HOST}/  timeout=3
     Run Keyword And Expect Error  ConnectionError*  Get Request  openbmc  /list
 
-Test Non-SSL Connection To Port 443
+Test Non SSL Connection To Port 443
     [Documentation]  Test that OpenBmc does not accept the non-secure
     ...  http connection at port 443 and would expect a connection error.
     [Tags]  Test_Non_SSL_Connection_To_Port_443
diff --git a/tests/test_boot_policies.robot b/tests/test_boot_policies.robot
index 3239744..a65c469 100644
--- a/tests/test_boot_policies.robot
+++ b/tests/test_boot_policies.robot
@@ -70,7 +70,7 @@
 Test Boot Order via REST
     [Documentation]   Set boot policy to PERMANENT and boot device to CDROM
     ...               and verify that the order doesn't change post power on.
-    [Tags]  chassisboot  Test_Boot_Order_via_REST
+    [Tags]  Test_Boot_Order_via_REST
 
 
     Set Boot Policy  ${PERMANENT}
@@ -85,7 +85,7 @@
 Persist ONETIME Boot Policy After Reset
     [Documentation]   Verify ONETIME boot policy order does not change
     ...               on warm reset.
-    [Tags]  chassisboot   Persist_ONETIME_Boot_Policy_After_Reset
+    [Tags]  Persist_ONETIME_Boot_Policy_After_Reset
 
     Set Boot Policy  ${ONETIME}
     Set Boot Source  ${BOOT_SOURCE_NETWORK}
@@ -101,7 +101,7 @@
 Persist PERMANENT Boot Policy After Reset
     [Documentation]   Verify PERMANENT boot policy order does not change
     ...               on warm reset.
-    [Tags]  chassisboot    Persist_PERMANENT_Boot_Policy_After_Reset
+    [Tags]  Persist_PERMANENT_Boot_Policy_After_Reset
 
     Set Boot Policy  ${PERMANENT}
     Set Boot Source  ${BOOT_SOURCE_CDROM}
diff --git a/tests/test_hardware_sensors.robot b/tests/test_hardware_sensors.robot
index afe06ea..9086211 100644
--- a/tests/test_hardware_sensors.robot
+++ b/tests/test_hardware_sensors.robot
@@ -34,7 +34,7 @@
 
 Verify Fan Sensors Attributes
    [Documentation]  Check fan attributes.
-   [Tags]  Verify_Fan_Sensor_Attributes
+   [Tags]  Verify_Fan_Sensors_Attributes
 
    # Example:
    # "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
@@ -71,7 +71,7 @@
 
 Verify PCIE Sensors Attributes
    [Documentation]  Probe PCIE attributes.
-   [Tags]  Verify_PCIE_Sensor_Attributes
+   [Tags]  Verify_PCIE_Sensors_Attributes
    # Example:
    # /xyz/openbmc_project/sensors/temperature/pcie
    ${temp_pcie}=  Get Endpoint Paths  /xyz/openbmc_project/sensors/  pcie
@@ -95,7 +95,7 @@
 
 Verify Rail Voltage Sensors Attributes
    [Documentation]  Check rail voltage attributes.
-   [Tags]  Verify_Rail_Voltage_Sensor_Attributes
+   [Tags]  Verify_Rail_Voltage_Sensors_Attributes
    # Example of one of the entries returned by 'Get Endpoint Paths':
    # /xyz/openbmc_project/sensors/voltage/rail_1_voltage
    # /xyz/openbmc_project/sensors/voltage/rail_2_voltage
@@ -216,7 +216,7 @@
 
 Verify Power Sensors Attributes
    [Documentation]  Check power sensor attributes.
-   [Tags]  Verify_Power_Sensor_Attributes
+   [Tags]  Verify_Power_Sensors_Attributes
    # Example:
    # /xyz/openbmc_project/sensors/power/power_1
    # /xyz/openbmc_project/sensors/power/power_2
@@ -246,7 +246,7 @@
 
 Verify Voltage Sensors Attributes
    [Documentation]  Check voltage sensors attributes.
-   [Tags]  Verify_Voltage_Sensor_Attributes
+   [Tags]  Verify_Voltage_Sensors_Attributes
 
    # Example:
    # "/xyz/openbmc_project/sensors/voltage/voltage0",
@@ -278,7 +278,7 @@
 
 Verify Current Sensors Attributes
    [Documentation]  Check current sensors attributes.
-   [Tags]  Verify_Current_Sensor_Attributes
+   [Tags]  Verify_Current_Sensors_Attributes
 
    # Example:
    # "/xyz/openbmc_project/sensors/current/current0",
diff --git a/tests/test_rest_interfaces.robot b/tests/test_rest_interfaces.robot
index 0801712..02a1abb 100644
--- a/tests/test_rest_interfaces.robot
+++ b/tests/test_rest_interfaces.robot
@@ -214,7 +214,7 @@
 Check Response Codes HTTP_UNSUPPORTED_MEDIA_TYPE
     [Documentation]  REST "Post" response status test for
     ...              HTTP_UNSUPPORTED_MEDIA_TYPE.
-    [Tags]  Check_Response_Codes_415
+    [Tags]  Check_Response_Codes_HTTP_UNSUPPORTED_MEDIA_TYPE
 
     # Example:
     # Response code:415, Content:{
@@ -303,7 +303,7 @@
 Post Response Code
     [Documentation]  REST Post request url and expect the
     ...              REST response code pre define.
-    [Tags]  Post_Response_Codes
+    [Tags]  Post_Response_Code
     [Template]  Execute Post And Check Response
 
     # Expect status                 URL Path
@@ -316,7 +316,7 @@
 Delete Response Code
     [Documentation]  REST "Delete" request url and expect the
     ...              REST response code pre define.
-    [Tags]  Delete_Response_Codes
+    [Tags]  Delete_Response_Code
     [Template]  Execute Delete And Check Response
 
     # Expect status                 URL Path
@@ -352,7 +352,7 @@
 
 Verify REST Put Message JSON Compliant
     [Documentation]  Verify REST "PUT" message is JSON format compliant.
-    [Tags]  REST_Put_Message_JSON_Format_Compliance_Test
+    [Tags]  Verify_REST_Put_Message_JSON_Compliant
     # Example:
     # Response code:200, Content:{
     #  "data": null,
diff --git a/tests/test_time.robot b/tests/test_time.robot
index ee880b9..9fe9ecf 100644
--- a/tests/test_time.robot
+++ b/tests/test_time.robot
@@ -225,7 +225,7 @@
 Set Host Time With BMC Owner NTP
     [Documentation]  Set host time when time owner is BMC and time mode is
     ...              NTP.
-    [Tags]  Set_Host_Time_With_BMC_And_NTP
+    [Tags]  Set_Host_Time_With_BMC_Owner_NTP
     [Template]  Set Time Using REST
     [Teardown]  Run Keywords  Set Time Owner  ${BMC_OWNER}  AND  Post Test Case Execution