diff --git a/shaker/engine/executors/iperf.py b/shaker/engine/executors/iperf.py
index 9f5cab4..7dbceae 100644
--- a/shaker/engine/executors/iperf.py
+++ b/shaker/engine/executors/iperf.py
@@ -31,10 +31,10 @@ def add_common_iperf_params(cmd, executor):
         cmd.add('--len', executor.test_definition.get('buffer_size'))
     if executor.test_definition.get('udp'):
         cmd.add('--udp')
-        if executor.test_definition.get('bandwidth') is not None:
-            cmd.add('--bandwidth', executor.test_definition.get('bandwidth'))
         if executor.test_definition.get('datagram_size'):
             cmd.add('--len', executor.test_definition.get('datagram_size'))
+    if executor.test_definition.get('bandwidth') is not None:
+        cmd.add('--bandwidth', executor.test_definition.get('bandwidth'))
     cmd.add('--time', executor.get_expected_duration())
     cmd.add('--parallel', executor.test_definition.get('threads') or 1)
     if executor.test_definition.get('interval'):
diff --git a/shaker/tests/test_iperf_executor.py b/shaker/tests/test_iperf_executor.py
index ac602dd..52cceb5 100644
--- a/shaker/tests/test_iperf_executor.py
+++ b/shaker/tests/test_iperf_executor.py
@@ -40,7 +40,7 @@ class TestIperfGraphExecutor(testtools.TestCase):
              'datagram_size': 1470}, AGENT)
 
         expected = {'data': ('iperf --client %s --format m '
-                             '--udp --bandwidth 100M --len 1470 '
+                             '--udp --len 1470 --bandwidth 100M '
                              '--time 30 --parallel 1 --interval 1 --nodelay '
                              '--reportstyle C') % IP,
                     'type': 'program'}
@@ -138,7 +138,7 @@ class TestIperf3Executor(testtools.TestCase):
              'datagram_size': 1470}, AGENT)
 
         expected = {'data': ('iperf3 --client %s --format m '
-                             '--udp --bandwidth 100M --len 1470 '
+                             '--udp --len 1470 --bandwidth 100M '
                              '--time 30 --parallel 1 --interval 1 '
                              '--json') % IP,
                     'type': 'program'}