diff --git a/redfish/extended/test_bmc_dump.robot b/redfish/extended/test_bmc_dump.robot
index c659300..9d075a4 100644
--- a/redfish/extended/test_bmc_dump.robot
+++ b/redfish/extended/test_bmc_dump.robot
@@ -104,9 +104,10 @@
     [Documentation]  Create and delete BMC dump multiple times.
     [Tags]  Create_And_Delete_BMC_Dump_Multiple_Times
 
-    :FOR  ${INDEX}  IN RANGE  1  5
-    \  ${dump_id}=  Create User Initiated Dump
-    \  Delete BMC Dump  ${dump_id}
+    FOR  ${INDEX}  IN  1  5
+      ${dump_id}=  Create User Initiated Dump
+      Delete BMC Dump  ${dump_id}
+    END
 
 
 Delete All BMC Dumps And Verify
@@ -159,10 +160,11 @@
 
     # Loop, creating a dump each iteration.  Will either get dump_id or
     # will get EMPTY when out of dump space.
-    :FOR  ${n}  IN RANGE  ${too_many_dumps}
-    \  ${dump_id}=  Create User Initiated Dump  check_out_of_space=${True}
-    \  Exit For Loop If  '${dump_id}' == '${EMPTY}'
-    \  Check Existence Of BMC Dump File  ${dump_id}
+    FOR  ${n}  IN RANGE  0  ${too_many_dumps}
+      ${dump_id}=  Create User Initiated Dump  check_out_of_space=${True}
+      Exit For Loop If  '${dump_id}' == '${EMPTY}'
+      Check Existence Of BMC Dump File  ${dump_id}
+    END
 
     Run Keyword If  '${dump_id}' != '${EMPTY}'  Fail
     ...  msg=Did not run out of dump space as expected.
diff --git a/redfish/extended/test_remote_logging.robot b/redfish/extended/test_remote_logging.robot
index a62fc0e..eafc645 100644
--- a/redfish/extended/test_remote_logging.robot
+++ b/redfish/extended/test_remote_logging.robot
@@ -300,10 +300,11 @@
 
     @{lines}=  Split To Lines  ${bmc_journald}
 
-    :FOR  ${line}  IN  @{lines}
-    \  Log To Console  \n ${line}
-    \  Should Contain  ${remote_journald}  ${line}
-    ...  mgs=${line} line doesn't contain in ${remote_journald}.
+    FOR  ${line}  IN  @{lines}
+      Log To Console  \n ${line}
+      Should Contain  ${remote_journald}  ${line}
+      ...  mgs=${line} line doesn't contain in ${remote_journald}.
+    END
 
 
 *** Keywords ***
diff --git a/redfish/extended/test_software_manager.robot b/redfish/extended/test_software_manager.robot
index de5e570..b523f12 100755
--- a/redfish/extended/test_software_manager.robot
+++ b/redfish/extended/test_software_manager.robot
@@ -23,11 +23,11 @@
 
     ${object_uris}=  Read Properties  ${SOFTWARE_VERSION_URI}list
 
-    :FOR  ${uri}  IN  @{object_uris}
-    \  ${object}=  Read Properties  ${uri}
-    \  Continue For Loop If  not 'Purpose' in ${object}
-    \  Should Contain Any  &{object}[Purpose]  ${VERSION_PURPOSE_HOST}
-    ...  ${VERSION_PURPOSE_BMC}
+    FOR  ${uri}  IN  @{object_uris}
+      ${object}=  Read Properties  ${uri}
+      Continue For Loop If  not 'Purpose' in ${object}
+      Should Contain Any  &{object}[Purpose]  ${VERSION_PURPOSE_HOST}  ${VERSION_PURPOSE_BMC}
+    END
 
 
 BMC Software Hex ID