diff --git a/ssh_runner.py b/ssh_runner.py
index 76fc6b5..3415382 100644
--- a/ssh_runner.py
+++ b/ssh_runner.py
@@ -6,7 +6,7 @@
 from utils import ssh_connect
 
 import itest
-from utils import get_barrier, log_error
+from utils import get_barrier, log_error, wait_on_barrier
 
 conn_uri_attrs = ("user", "passwd", "host", "port", "path")
 
@@ -76,6 +76,8 @@
         test_iter = itest.run_test_iter(obj, conn)
         next(test_iter)
 
+        wait_on_barrier(barrier, latest_start_time)
+
         with log_error("!Run test"):
             return next(test_iter)
     except:
@@ -111,6 +113,9 @@
         while not result_queue.empty():
             test_result.append(result_queue.get())
 
+        for conn in connections:
+            conn.close()
+
         return test_result
 
     return closure