diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index 2a54456f73..9cb1318172 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -268,7 +268,7 @@ function main() {
     local autoserv_args="-m ${FLAGS_remote} --ssh-port ${FLAGS_ssh_port} \
         ${option} ${control_file} -r ${results_dir} ${verbose}"
     if [ -n "${FLAGS_args}" ]; then
-      autoserv_args="${autoserv_args} -a \"${FLAGS_args}\""
+      autoserv_args="${autoserv_args} --args=${FLAGS_args}"
     fi
 
     sudo chmod a+w ./server/{tests,site_tests}
@@ -291,5 +291,5 @@ function main() {
   print_time_elapsed
 }
 
-restart_in_chroot_if_needed $*
+restart_in_chroot_if_needed "$@"
 main "$@"