diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index d223db4..2de12ec 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -15,7 +15,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Foce Tags                Lock_Management
+Force Tags               Lock_Management
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index e006f22..ebd2b78 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -400,7 +400,7 @@
 
     ${expected_resp}=  Set Variable If
     ...  '${expected_status}' == 'ok'     ${HTTP_OK}, ${HTTP_NO_CONTENT}
-    ...  '${expected_status}' == 'error'  ${HTTP_NOT_FOUND},${HTTP_INTERNAL_SERVER_ERROR} 
+    ...  '${expected_status}' == 'error'  ${HTTP_NOT_FOUND},${HTTP_INTERNAL_SERVER_ERROR}
 
     ${response}=  Redfishtool Post
     ...  ${payload}  /redfish/v1/CertificateService/Actions/CertificateService.ReplaceCertificate
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index 5f6741d..89e4d3d 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -285,7 +285,7 @@
     Sleep  3s
 
     ${task_inv2}=  Get Task Inventory  ${task_info2}
-    Log  ${task_inv2}   
+    Log  ${task_inv2}
 
     Wait Until Keyword Succeeds  5 min  10 sec
     ...  Verify Task Progress State  ${task_inv2}  ${task_inv_dict['TaskException']}
diff --git a/tests/security/test_ssl.robot b/tests/security/test_ssl.robot
index 08e0dfb..b5f0a96 100644
--- a/tests/security/test_ssl.robot
+++ b/tests/security/test_ssl.robot
@@ -24,6 +24,6 @@
 Test Non SSL Connection To HTTPS Port
     [Documentation]  Test that OpenBmc does not accept the non-secure
     ...  http connection at port ${HTTPS_PORT} and would expect a connection error.
-    [Tags]  Test_Non_SSL_Connection_To_Https_Port
+    [Tags]  Test_Non_SSL_Connection_To_HTTPS_Port
     Create Session  openbmc  http://${OPENBMC_HOST}:${HTTPS_PORT}/  timeout=3
     Run Keyword And Expect Error  ConnectionError*  Get Request  openbmc  /list