diff --git a/gui/gui_test/control_menu/test_manage_power_usage_sub_menu.robot b/gui/gui_test/control_menu/test_manage_power_usage_sub_menu.robot
index e9cffa1..34bed04 100644
--- a/gui/gui_test/control_menu/test_manage_power_usage_sub_menu.robot
+++ b/gui/gui_test/control_menu/test_manage_power_usage_sub_menu.robot
@@ -57,7 +57,8 @@
     Page Should Contain Element  ${xpath_power_ops_checkbox}
 
     # Set a value in check box.
-    ${checkbox_Selected}=  Run Keyword And Return Status  Checkbox Should Be Selected  ${xpath_power_ops_checkbox}
+    ${checkbox_Selected}=  Run Keyword And Return Status
+    ...  Checkbox Should Be Selected  ${xpath_power_ops_checkbox}
     Run Keyword If  False == ${checkbox_Selected}  Click Element  ${xpath_power_ops_checkbox}
     Wait Until Element Is Enabled  ${xpath_cap_input_button}  timeout=10
     Input Text  ${xpath_cap_input_button}  ${499}
diff --git a/gui/gui_test/server_config/test_obmc_gui_network_settings.robot b/gui/gui_test/server_config/test_obmc_gui_network_settings.robot
index 2d38112..9dab942 100644
--- a/gui/gui_test/server_config/test_obmc_gui_network_settings.robot
+++ b/gui/gui_test/server_config/test_obmc_gui_network_settings.robot
@@ -432,7 +432,7 @@
     ${ip_addresses}=  Get Static IPv4 Addresses From GUI
     Should Contain  ${ip_addresses}  ${ip_address}  msg=${ip_address} does not exist on BMC
 
-    ${delete_ip_buttons}=  Get WebElements  ${xpath_delete_static_ip} 
+    ${delete_ip_buttons}=  Get WebElements  ${xpath_delete_static_ip}
     FOR  ${location}  IN RANGE  len(${ip_addresses})
        ${gui_ip}=  Get Value  //*[@data-test-id="networkSettings-input-staticIpv4-${location}"]
        Run Keyword If  '${gui_ip}' == '${ip_address}' and '${gui_ip}' != '${BMC_IP}'
diff --git a/openpower/ext_interfaces/test_client_identifier.robot b/openpower/ext_interfaces/test_client_identifier.robot
index b699949..d9592dd 100644
--- a/openpower/ext_interfaces/test_client_identifier.robot
+++ b/openpower/ext_interfaces/test_client_identifier.robot
@@ -148,7 +148,8 @@
     &{tmp_dict}=  Create Dictionary
 
     FOR  ${client}  IN  @{client_id}
-      ${resp}=  Redfish Login  rest_username=${username}  rest_password=${password}  kwargs= "Oem":{"OpenBMC" : {"ClientID":"${client}"}}
+      ${resp}=  Redfish Login  rest_username=${username}  rest_password=${password}
+      ...  kwargs= "Oem":{"OpenBMC" : {"ClientID":"${client}"}}
       Append To List  ${session_list}  ${resp}
     END
 
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index 2f3f217..0b2821f 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -361,14 +361,14 @@
     # Example of Redfish event logs:
     # elog_entry:
     #  [0]:
-    #    [Message]:                                    xyz.openbmc_project.Common.Error.InternalFailure
-    #    [Created]:                                    2020-04-20T01:55:22+00:00
-    #    [Id]:                                         1
-    #    [@odata.id]:                                  /redfish/v1/Systems/system/LogServices/EventLog/Entries/1
-    #    [@odata.type]:                                #LogEntry.v1_4_0.LogEntry
-    #    [EntryType]:                                  Event
-    #    [Severity]:                                   Critical
-    #    [Name]:                                       System Event Log Entry
+    #    [Message]:                             xyz.openbmc_project.Common.Error.InternalFailure
+    #    [Created]:                             2020-04-20T01:55:22+00:00
+    #    [Id]:                                  1
+    #    [@odata.id]:                           /redfish/v1/Systems/system/LogServices/EventLog/Entries/1
+    #    [@odata.type]:                         #LogEntry.v1_4_0.LogEntry
+    #    [EntryType]:                           Event
+    #    [Severity]:                            Critical
+    #    [Name]:                                System Event Log Entry
 
     ${redfish_log_time}=  Convert Date  ${elog_entry[0]["Created"]}  epoch
 
@@ -376,14 +376,14 @@
     # Example output from 'Peltool  -l':
     # pel_records:
     # [0x50000023]:
-    #   [SRC]:                                        BD8D1002
-    #   [CreatorID]:                                  BMC
-    #   [Message]:                                    An application had an internal failure
-    #   [CompID]:                                     0x1000
-    #   [PLID]:                                       0x50000023
-    #   [Commit Time]:                                04/20/2020 01:55:22
-    #   [Subsystem]:                                  BMC Firmware
-    #   [Sev]:                                        Unrecoverable Error
+    #   [SRC]:                                   BD8D1002
+    #   [CreatorID]:                             BMC
+    #   [Message]:                               An application had an internal failure
+    #   [CompID]:                                0x1000
+    #   [PLID]:                                  0x50000023
+    #   [Commit Time]:                           04/20/2020 01:55:22
+    #   [Subsystem]:                             BMC Firmware
+    #   [Sev]:                                   Unrecoverable Error
 
     ${ids}=  Get Dictionary Keys  ${pel_records}
     ${id}=  Get From List  ${ids}  0
@@ -711,7 +711,8 @@
     # Number of logs can be 80% of the total logs created after trimming.
     ${expected_max_record}=   Evaluate  3000 * 0.8
 
-    Run Keyword If  ${trimmed_as_expected} == False   Should Be True  ${no_pel_records} <= ${expected_max_record}
+    Run Keyword If  ${trimmed_as_expected} == False
+    ...  Should Be True  ${no_pel_records} <= ${expected_max_record}
 
 
 Create Error Log
diff --git a/openpower/ras/ras_utils.robot b/openpower/ras/ras_utils.robot
index f6dc00a..8ee6102 100755
--- a/openpower/ras/ras_utils.robot
+++ b/openpower/ras/ras_utils.robot
@@ -108,7 +108,8 @@
     Wait for OS
     Verify Error Log Entry  ${signature_desc}  ${log_prefix}
 
-    ${dump_service_status}  ${stderr}  ${rc}=  BMC Execute Command  systemctl status xyz.openbmc_project.Dump.Manager.service
+    ${dump_service_status}  ${stderr}  ${rc}=  BMC Execute Command
+    ...  systemctl status xyz.openbmc_project.Dump.Manager.service
     Should Contain  ${dump_service_status}  Active: active (running)
 
     ${resp}=  OpenBMC Get Request  ${DUMP_URI}