diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index e634e6a..4e60958 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -211,7 +211,11 @@
   echo "TEST_TYPE=\"${control_type}\"" > ${new_control_file}
   echo "def step_init():" >> ${new_control_file}
   for i in $(seq 1 ${control_file_count}); do
-    echo "    job.next_step('step${i}')" >> ${new_control_file}
+    if [[ "${control_type}" == "client" ]]; then
+      echo "    job.next_step('step${i}')" >> ${new_control_file}
+    else
+      echo "    step${i}()" >> ${new_control_file}
+    fi
   done
 
   local index=1
@@ -224,6 +228,9 @@
     cat ${control_file_path} | sed "s/^/    /" >> ${new_control_file}
     let index=index+1
   done
+  if [[ "${control_type}" == "server" ]]; then
+    echo "step_init()" >> ${new_control_file}
+  fi
   echo "${new_control_file}"
 }