diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 148667f..156536b 100644
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -470,10 +470,10 @@
         ${limiting_bw_value_dnstream}    Get Bandwidth Details    ${bandwidth_profile_name}
 
         # Stream UDP packets from RG to server
-        Run Keyword If    ${limiting_bw_value_upstream} != 1000000
-        ...    ${uprate}=    Evaluate    ${limiting_bw_value_upstream}*${udp_rate_multiplier}
+        ${uprate}=    Run Keyword If    ${limiting_bw_value_upstream} != 1000000
+        ...    Evaluate    ${limiting_bw_value_upstream}*${udp_rate_multiplier}
         ...    ELSE
-        ...    ${uprate}=    Set Variable  ${limiting_bw_value_upstream}
+        ...    Set Variable  ${limiting_bw_value_upstream}
 
         ${updict}=    Run Iperf3 Test Client    ${src}    server=${dst['dp_iface_ip_qinq']}
         ...    args=-u -b ${uprate}K -t 30 -l ${udp_packet_bytes} --pacing-timer 0
@@ -482,10 +482,10 @@
         ...    (100 - ${updict['end']['sum']['lost_percent']})*${updict['end']['sum']['bits_per_second']}/100000
 
         # Stream UDP packets from server to RG
-        Run Keyword If    ${limiting_bw_value_dnstream} != 1000000
-        ...    ${dnrate}=    Evaluate    ${limiting_bw_value_dnstream}*${udp_rate_multiplier}
+        ${dnrate}=    Run Keyword If    ${limiting_bw_value_dnstream} != 1000000
+        ...    Evaluate    ${limiting_bw_value_dnstream}*${udp_rate_multiplier}
         ...    ELSE
-        ...    ${dnrate}=    Set Variable  ${limiting_bw_value_dnstream}
+        ...    Set Variable  ${limiting_bw_value_dnstream}
         ${dndict}=    Run Iperf3 Test Client    ${src}    server=${dst['dp_iface_ip_qinq']}
         ...    args=-u -b ${dnrate}K -R -t 30 -l ${udp_packet_bytes} --pacing-timer 0
         # With UDP test, bits per second is the sending rate.  Multiply by the loss rate to get the throughput.
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 67771ea..1062c34 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -560,10 +560,10 @@
         ${limiting_bw_value_dnstream}    Get Bandwidth Details    ${bandwidth_profile_name}
 
         # Stream UDP packets from RG to server
-        Run Keyword If    ${limiting_bw_value_upstream} != 1000000
-        ...    ${uprate}=    Evaluate    ${limiting_bw_value_upstream}*${udp_rate_multiplier}
+        ${uprate}=    Run Keyword If    ${limiting_bw_value_upstream} != 1000000
+        ...    Evaluate    ${limiting_bw_value_upstream}*${udp_rate_multiplier}
         ...    ELSE
-        ...    ${uprate}=    Set Variable  ${limiting_bw_value_upstream}
+        ...    Set Variable  ${limiting_bw_value_upstream}
         ${updict}=    Run Iperf3 Test Client    ${src}    server=${dst['dp_iface_ip_qinq']}
         ...    args=-u -b ${uprate}K -t 30 -l ${udp_packet_bytes} --pacing-timer 0
         # With UDP test, bits per second is the sending rate.  Multiply by the loss rate to get the throughput.
@@ -571,10 +571,10 @@
         ...    (100 - ${updict['end']['sum']['lost_percent']})*${updict['end']['sum']['bits_per_second']}/100000
 
         # Stream UDP packets from server to RG
-        Run Keyword If    ${limiting_bw_value_dnstream} != 1000000
-        ...    ${dnrate}=    Evaluate    ${limiting_bw_value_dnstream}*${udp_rate_multiplier}
+        ${dnrate}=    Run Keyword If    ${limiting_bw_value_dnstream} != 1000000
+        ...    Evaluate    ${limiting_bw_value_dnstream}*${udp_rate_multiplier}
         ...    ELSE
-        ...    ${dnrate}=    Set Variable  ${limiting_bw_value_dnstream}
+        ...    Set Variable  ${limiting_bw_value_dnstream}
         ${dndict}=    Run Iperf3 Test Client    ${src}    server=${dst['dp_iface_ip_qinq']}
         ...    args=-u -b ${dnrate}K -R -t 30 -l ${udp_packet_bytes} --pacing-timer 0
         # With UDP test, bits per second is the sending rate.  Multiply by the loss rate to get the throughput.