diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index d38ffe8..59033a3 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -33,9 +33,10 @@
     ...  Secondary LAN channel is not available for OOB
     ...  No serial channel is available
 
-    :FOR  ${capability}  IN  @{supported_capabilities}
-    \  Should Contain  ${cmd_output}  ${capability}  ignore_case=True
-    ...  msg=Supported DCMI capabilities not present.
+    FOR  ${capability}  IN  @{supported_capabilities}
+      Should Contain  ${cmd_output}  ${capability}  ignore_case=True
+      ...  msg=Supported DCMI capabilities not present.
+    END
 
 
 Test Get Self Test Results via IPMI Raw Command
diff --git a/ipmi/test_ipmi_network.robot b/ipmi/test_ipmi_network.robot
index 63ea9e4..8f60889 100644
--- a/ipmi/test_ipmi_network.robot
+++ b/ipmi/test_ipmi_network.robot
@@ -28,10 +28,11 @@
     [Tags]  Retrieve_IP_Address_Via_IPMI_And_Verify_Using_Redish
 
     ${active_channel_config}=  Get Active Channel Config
-    :FOR  ${channel_number}  IN  @{active_channel_config.keys()}
-    \  Verify Channel Info  ${channel_number}  IPv4StaticAddresses  ${active_channel_config}
+    FOR  ${channel_number}  IN  @{active_channel_config.keys()}
+      Verify Channel Info  ${channel_number}  IPv4StaticAddresses  ${active_channel_config}
     END
 
+
 Retrieve Default Gateway Via IPMI And Verify
     [Documentation]  Retrieve default gateway via IPMI and verify it's existence on the BMC.
     [Tags]  Retrieve_Default_Gateway_Via_IPMI_And_Verify
@@ -46,8 +47,8 @@
     [Tags]  Retrieve_MAC_Address_Via_IPMI_And_Verify_Using_Redfish
 
     ${active_channel_config}=  Get Active Channel Config
-    :FOR  ${channel_number}  IN  @{active_channel_config.keys()}
-    \  Verify Channel Info  ${channel_number}  MACAddress  ${active_channel_config}
+    FOR  ${channel_number}  IN  @{active_channel_config.keys()}
+      Verify Channel Info  ${channel_number}  MACAddress  ${active_channel_config}
     END
 
 
@@ -58,8 +59,9 @@
     ${channel_count}=  Get Physical Network Interface Count
 
     # Note: IPMI network channel logically starts from 1.
-    :FOR  ${channel_number}  IN RANGE  1  ${channel_count}
-    \  Run IPMI Standard Command  lan print ${channel_number}
+    FOR  ${channel_number}  IN RANGE  1  ${channel_count}
+      Run IPMI Standard Command  lan print ${channel_number}
+    END
 
 
 Test Invalid IPMI Channel Response
@@ -112,10 +114,10 @@
     ...  IPv4Addresses
 
     FOR  ${ipv4_address}  IN  @{ipv4_addresses}
-        ${ip_address_source}=
-        ...  Set Variable if  '${ipv4_address['Address']}' == '${lan_config['IP Address']}'
-        ...  ${ipv4_address['AddressOrigin']} Address
-          Exit For Loop IF  "${ip_address_source}" != 'None'
+      ${ip_address_source}=
+      ...  Set Variable if  '${ipv4_address['Address']}' == '${lan_config['IP Address']}'
+      ...  ${ipv4_address['AddressOrigin']} Address
+      Exit For Loop IF  "${ip_address_source}" != 'None'
     END
 
     Valid Value  lan_config['IP Address Source']  ['${ip_address_source}']