diff --git a/slapos/recipe/erp5scalabilitytestbed/template/nosqltester_run.in b/slapos/recipe/erp5scalabilitytestbed/template/nosqltester_run.in
index 38129b9dc2578d3b0f778cb9ff6f0b32fa9dac4b..336d6990e49e90a3aa9ecee00c135365e7145319 100755
--- a/slapos/recipe/erp5scalabilitytestbed/template/nosqltester_run.in
+++ b/slapos/recipe/erp5scalabilitytestbed/template/nosqltester_run.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
+cd %(benchmark_suite_path)s \
 exec %(scalability_tester_binary)s -m %(host_address)s -a %(tester_address)s -r %(report_path)s \
-    --report-directory %(report_path)s --repeat %(repeat)d %(erp5_url)s %(nb_users)d \
+    -l %(report_path)s --repeat %(repeat)s %(erp5_url)s %(nb_users)s \
     %(benchmark_suites)s
diff --git a/software/erp5scalabilitytestbed/instance.cfg b/software/erp5scalabilitytestbed/instance.cfg
index 358ae6e192b54c514a8ee14978e80c55903a0e35..c259987201e7bad6abd42e572323c66a15f411a7 100644
--- a/software/erp5scalabilitytestbed/instance.cfg
+++ b/software/erp5scalabilitytestbed/instance.cfg
@@ -10,3 +10,4 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 recipe = slapos.cookbook:nosqltestbed
 scalability_tester_erp5_binary = ${buildout:bin-directory}/scalability_tester_erp5
 scalability_tester_manager_binary = ${buildout:bin-directory}/nosqltester_manager
+benchmark_suite_path = ${scalability-test-suite:location}