diff --git a/hl_tests/postgres/run.sh b/hl_tests/postgres/run.sh
index 132ed97..b71a082 100755
--- a/hl_tests/postgres/run.sh
+++ b/hl_tests/postgres/run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-CLIENTS=${CLIENTS:-"4 8"}
-TRANSACTINOS_PER_CLIENT=${TRANSACTINOS_PER_CLIENT:-"1 2"}
+CLIENTS=$(echo $1 | tr ',' '\n')
+TRANSACTINOS_PER_CLIENT=$(echo $2 | tr ',' '\n')
 
 
 sudo -u postgres createdb -O postgres pgbench
diff --git a/itest.py b/itest.py
index d63a9b4..c8b641b 100644
--- a/itest.py
+++ b/itest.py
@@ -63,7 +63,7 @@
 
     def run(self, conn):
         remote_script = self.copy_script(conn, self.run_script)
-        cmd = remote_script
+        cmd = remote_script + ' ' + ' '.join(self.opts)
         code, out, err = run_over_ssh(conn, cmd)
         self.on_result(code, out, err, cmd)