diff --git a/wally/run_test.py b/wally/run_test.py
index 0b20657..07ac6e3 100755
--- a/wally/run_test.py
+++ b/wally/run_test.py
@@ -118,7 +118,7 @@
         test_cls = tool_type_mapper[name]
         rem_folder = cfg['default_test_local_folder'].format(name=name)
 
-        for node in test_nodes:
+        for idx, node in enumerate(test_nodes):
             msg = "Starting {0} test on {1} node"
             logger.debug(msg.format(name, node.conn_url))
 
@@ -130,7 +130,11 @@
             if not os.path.exists(dr):
                 os.makedirs(dr)
 
-            test = test_cls(params, res_q.put, cfg['run_uuid'], node,
+            test = test_cls(options=params,
+                            is_primary=(idx == 0),
+                            on_result_cb=res_q.put,
+                            test_uuid=cfg['run_uuid'],
+                            node=node,
                             remote_dir=rem_folder,
                             log_directory=dr,
                             coordination_queue=coord_q)