diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53bce9ec5d..084063fd54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,7 +293,8 @@ opm_add_test(test_gatherconvergencereport
   CONDITION
     MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
   DRIVER_ARGS
-    4 ${PROJECT_BINARY_DIR}
+    -n 4
+    -b ${PROJECT_BINARY_DIR}
 )
 
 opm_add_test(test_gatherdeferredlogger
@@ -304,7 +305,8 @@ opm_add_test(test_gatherdeferredlogger
   CONDITION
     MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
   DRIVER_ARGS
-    4 ${PROJECT_BINARY_DIR}
+    -n 4
+    -b ${PROJECT_BINARY_DIR}
 )
 
 opm_add_test(test_parallelwellinfo_mpi
@@ -313,7 +315,8 @@ opm_add_test(test_parallelwellinfo_mpi
   CONDITION
     MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
   DRIVER_ARGS
-    4 ${PROJECT_BINARY_DIR}
+    -n 4
+    -b ${PROJECT_BINARY_DIR}
   NO_COMPILE
     )
 
diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake
index 8037e2e9f1..7501b5c230 100755
--- a/compareECLFiles.cmake
+++ b/compareECLFiles.cmake
@@ -31,11 +31,11 @@ function(add_test_runSimulator)
   set(TEST_ARGS ${PARAM_TEST_ARGS})
   opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
-               DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR}
-                           ${RESULT_PATH}
-                           ${PROJECT_BINARY_DIR}/bin
-                           ${PARAM_FILENAME}
-                           ${PARAM_PROCS}
+               DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
+                           -r ${RESULT_PATH}
+                           -b ${PROJECT_BINARY_DIR}/bin
+                           -f ${PARAM_FILENAME}
+                           -n ${PARAM_PROCS}
                TEST_ARGS ${TEST_ARGS}
                CONFIGURATION extra)
 endfunction()
@@ -59,26 +59,25 @@ function(add_test_compareECLFiles)
   if(NOT PARAM_PREFIX)
     set(PARAM_PREFIX compareECLFiles)
   endif()
-  if(NOT PARAM_RESTART_STEP)
-    set(PARAM_RESTART_STEP 0)
-  endif()
-  if(NOT DEFINED PARAM_RESTART_SCHED)
-    set(sched_restart "--")
-  else()
-    set(sched_restart "--sched-restart=${PARAM_RESTART_SCHED}")
-  endif()
   set(RESULT_PATH ${BASE_RESULT_PATH}${PARAM_DIR_PREFIX}/${PARAM_SIMULATOR}+${PARAM_CASENAME})
   set(TEST_ARGS ${PARAM_TEST_ARGS})
+  set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
+                  -r ${RESULT_PATH}
+                  -b ${PROJECT_BINARY_DIR}/bin
+                  -f ${PARAM_FILENAME}
+                  -a ${PARAM_ABS_TOL}
+                  -t ${PARAM_REL_TOL}
+                  -c ${COMPARE_ECL_COMMAND}
+                  -d ${RST_DECK_COMMAND})
+   if(PARAM_RESTART_STEP)
+     list(APPEND DRIVER_ARGS -s ${PARAM_RESTART_STEP})
+   endif()
+  if(PARAM_RESTART_SCHED)
+   list(APPEND DRIVER_ARGS -h ${PARAM_RESTART_SCHED})
+  endif()
   opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
-               DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH}
-                           ${PROJECT_BINARY_DIR}/bin
-                           ${PARAM_FILENAME}
-                           ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_ECL_COMMAND}
-                           ${RST_DECK_COMMAND}
-                           ${PARAM_RESTART_STEP}
-                           ${sched_restart}
+               DRIVER_ARGS ${DRIVER_ARGS}
                TEST_ARGS ${TEST_ARGS})
 endfunction()
 
@@ -108,12 +107,14 @@ function(add_test_compare_restarted_simulation)
   set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
   opm_add_test(${TEST_NAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
-               DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH}
-                           ${PROJECT_BINARY_DIR}/bin
-                           ${PARAM_FILENAME}
-                           ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_ECL_COMMAND}
-                           ${OPM_PACK_COMMAND}
+               DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
+                           -r ${RESULT_PATH}
+                           -b ${PROJECT_BINARY_DIR}/bin
+                           -f ${PARAM_FILENAME}
+                           -a ${PARAM_ABS_TOL}
+                           -t ${PARAM_REL_TOL}
+                           -c ${COMPARE_ECL_COMMAND}
+                           -p ${OPM_PACK_COMMAND}
                TEST_ARGS ${PARAM_TEST_ARGS})
 endfunction()
 
@@ -142,11 +143,13 @@ function(add_test_compare_parallel_simulation)
   # Add test that runs flow_mpi and outputs the results to file
   opm_add_test(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
-               DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH}
-                           ${PROJECT_BINARY_DIR}/bin
-                           ${PARAM_FILENAME}
-                           ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_ECL_COMMAND}
+               DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
+                           -r ${RESULT_PATH}
+                           -b ${PROJECT_BINARY_DIR}/bin
+                           -f ${PARAM_FILENAME}
+                           -a ${PARAM_ABS_TOL}
+                           -t ${PARAM_REL_TOL}
+                           -c ${COMPARE_ECL_COMMAND}
                TEST_ARGS ${TEST_ARGS})
   set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}
                        PROPERTIES RUN_SERIAL 1)
@@ -164,22 +167,28 @@ endfunction()
 #   - This test class compares the output from a restarted parallel simulation
 #     to that of a non-restarted parallel simulation.
 function(add_test_compare_parallel_restarted_simulation)
-  set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR)
+  set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS)
   set(multiValueArgs TEST_ARGS)
   cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
   if(NOT PARAM_DIR)
     set(PARAM_DIR ${PARAM_CASENAME})
   endif()
   set(RESULT_PATH ${BASE_RESULT_PATH}/parallelRestart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
+  set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
+                  -r ${RESULT_PATH}
+                  -b ${PROJECT_BINARY_DIR}/bin
+                  -f ${PARAM_FILENAME}
+                  -a ${PARAM_ABS_TOL}
+                  -t ${PARAM_REL_TOL}
+                  -c ${COMPARE_ECL_COMMAND}
+                  -p ${OPM_PACK_COMMAND})
+  if(PARAM_MPI_PROCS)
+    list(APPEND DRIVER_ARGS -n ${PARAM_MPI_PROCS})
+  endif()
 
   opm_add_test(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
-               DRIVER_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR} ${RESULT_PATH}
-                           ${PROJECT_BINARY_DIR}/bin
-                           ${PARAM_FILENAME}
-                           ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_ECL_COMMAND}
-                           ${OPM_PACK_COMMAND}
+               DRIVER_ARGS ${DRIVER_ARGS}
                TEST_ARGS ${PARAM_TEST_ARGS})
   set_tests_properties(compareParallelRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}
                        PROPERTIES RUN_SERIAL 1)
diff --git a/tests/run-init-regressionTest.sh b/tests/run-init-regressionTest.sh
index 84e467721a..d72e6fa3f5 100755
--- a/tests/run-init-regressionTest.sh
+++ b/tests/run-init-regressionTest.sh
@@ -6,16 +6,38 @@
 # Useful for models that are too large to do simulation on
 # as a regression test.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-# param 8, 9 and 10 ignored, only used with regression tests
-EXE_NAME="${11}"
-shift 11
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  exit 1
+fi
+
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    d) ;; # Ignored 
+    h) ;; # Ignored#
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 rm -Rf  ${RESULT_PATH}
diff --git a/tests/run-parallel-regressionTest.sh b/tests/run-parallel-regressionTest.sh
index 9e446c71e0..d3b3fa7480 100755
--- a/tests/run-parallel-regressionTest.sh
+++ b/tests/run-parallel-regressionTest.sh
@@ -4,15 +4,40 @@
 # then compares the summary and restart files from the two runs.
 # Meant to track regression in parallel simulators.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-EXE_NAME="${8}"
-shift 8
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  echo -e "\tOptional options:"
+  echo -e "\t\t -n <procs>    Number of MPI processes to use"
+  exit 1
+fi
+
+MPI_PROCS=4
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:e:n:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    n) MPI_PROCS=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 rm -Rf ${RESULT_PATH}
@@ -23,7 +48,7 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RE
 test $? -eq 0 || exit 1
 mkdir mpi
 cd mpi
-mpirun -np 4 ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}/mpi
+mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}/mpi
 test $? -eq 0 || exit 1
 cd ..
 
diff --git a/tests/run-parallel-restart-regressionTest.sh b/tests/run-parallel-restart-regressionTest.sh
index cd5c079857..55f98a43c1 100755
--- a/tests/run-parallel-restart-regressionTest.sh
+++ b/tests/run-parallel-restart-regressionTest.sh
@@ -4,16 +4,42 @@
 # run of the simulator, before comparing the output from the two runs.
 # This is meant to track regressions in the restart support.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-OPM_PACK_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -p <path>     Path to deck packing tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  echo -e "\tOptional options:"
+  echo -e "\t\t -n <procs>    Number of MPI processes to use"
+  exit 1
+fi
+
+MPI_PROCS=4
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:p:e:n:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    p) OPM_PACK_COMMAND=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    n) MPI_PROCS=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 BASE_NAME=${FILENAME}_RESTART.DATA
@@ -21,13 +47,13 @@ BASE_NAME=${FILENAME}_RESTART.DATA
 rm -Rf ${RESULT_PATH}
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
-mpirun -np 4 ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
+mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
 
 test $? -eq 0 || exit 1
 
 ${OPM_PACK_COMMAND} -o ${BASE_NAME} ${INPUT_DATA_PATH}/${FILENAME}_RESTART.DATA
 
-mpirun -np 4 ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
+mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${BASE_NAME} --enable-adaptive-time-stepping=false --output-dir=${RESULT_PATH} ${TEST_ARGS}
 test $? -eq 0 || exit 1
 
 ecode=0
diff --git a/tests/run-parallel-unitTest.sh b/tests/run-parallel-unitTest.sh
index f02f90cff3..51192a2552 100755
--- a/tests/run-parallel-unitTest.sh
+++ b/tests/run-parallel-unitTest.sh
@@ -1,6 +1,26 @@
 #!/bin/bash 
 # This executes a unit test in parallel.
-NP=$1 
-BDIR=$2 
-shift 2 
-mpirun -np $NP $BDIR/bin/$@
+
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -n <procs>    Number of MPI Processes to use"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  exit 1
+fi
+
+OPTIND=1
+while getopts "n:b:e:" OPT
+do
+  case "${OPT}" in
+    b) BDIR=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    n) NP=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
+TEST_ARGS="$@"
+
+mpirun -np $NP $BDIR/bin/${EXE_NAME} ${TEST_ARGS}
diff --git a/tests/run-porv-acceptanceTest.sh b/tests/run-porv-acceptanceTest.sh
index 09af096f9f..5d44ebde87 100755
--- a/tests/run-porv-acceptanceTest.sh
+++ b/tests/run-porv-acceptanceTest.sh
@@ -6,16 +6,38 @@
 # Useful for models that are too large to do simulation on
 # as a regression test.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-# param 8, 9 and 10 ignored, only used with regression tests
-EXE_NAME="${11}"
-shift 11
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  exit 1
+fi
+
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    d) ;; # Ignored
+    h) ;; # Ignored
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 rm -Rf  ${RESULT_PATH}
diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh
index 2248e08e68..82881f572f 100755
--- a/tests/run-regressionTest.sh
+++ b/tests/run-regressionTest.sh
@@ -3,18 +3,44 @@
 # This runs a simulator, then compares the summary, restart and init
 # files against a reference.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-RST_DECK_COMMAND="$8"
-RESTART_STEP="${9}"
-RESTART_SCHED="${10}"
-EXE_NAME="${11}"
-shift 11
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -d <path>     Path to restart deck tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  echo -e "\tOptional options:"
+  echo -e "\t\t -s <step>     Step to do restart testing from"
+  echo -e "\t\t -h value      sched_restart value to use in restart test"
+  exit 1
+fi
+
+RESTART_STEP=0
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:d:s:e:h:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    d) RST_DECK_COMMAND=${OPTARG} ;;
+    s) RESTART_STEP=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    h) RESTART_SCHED=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 mkdir -p ${RESULT_PATH}
@@ -43,17 +69,14 @@ fi
 if test $RESTART_STEP -ne 0
 then
   echo "=== Executing restart run ==="
-  if [ "$RESTART_SCHED" = "--" ]; then
-      sched_rst=""
-  else
-      sched_rst="${RESTART_SCHED}"
-  fi
-
   mkdir -p ${RESULT_PATH}/restart
   cp -f ${RESULT_PATH}/${FILENAME}.UNRST ${RESULT_PATH}/restart
   ${RST_DECK_COMMAND}  ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}:${RESTART_STEP} -m inline -s > ${RESULT_PATH}/restart/${FILENAME}.DATA
   cd ${RESULT_PATH}/restart
-  echo ${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}
+  if test -n "$RESTART_SCHED"
+  then
+    sched_rst="--sched-restart=${RESTART_SCHED}"
+  fi
   ${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}
   test $? -eq 0 || exit 1
 
diff --git a/tests/run-restart-regressionTest.sh b/tests/run-restart-regressionTest.sh
index 7ce34dcef3..f83f30655b 100755
--- a/tests/run-restart-regressionTest.sh
+++ b/tests/run-restart-regressionTest.sh
@@ -4,16 +4,38 @@
 # run of the simulator, before comparing the output from the two runs.
 # This is meant to track regressions in the restart support.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-OPM_PACK_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -p <path>     Path to deck packing tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  exit 1
+fi
+
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:p:e:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    p) OPM_PACK_COMMAND=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 BASE_NAME=${FILENAME}_RESTART.DATA
diff --git a/tests/run-summary-restart-regressionTest.sh b/tests/run-summary-restart-regressionTest.sh
index e5efa7c462..b96504efc5 100755
--- a/tests/run-summary-restart-regressionTest.sh
+++ b/tests/run-summary-restart-regressionTest.sh
@@ -6,16 +6,38 @@
 # but in situations where it is difficult to get the restart files to agree this
 # script can be used as second-best alternative.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-FILENAME="$4"
-ABS_TOL="$5"
-REL_TOL="$6"
-COMPARE_ECL_COMMAND="$7"
-OPM_PACK_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -a <tol>      Absolute tolerance in comparison"
+  echo -e "\t\t -t <tol>      Relative tolerance in comparison"
+  echo -e "\t\t -c <path>     Path to comparison tool"
+  echo -e "\t\t -p <path>     Path to deck packing tool"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  exit 1
+fi
+
+OPTIND=1
+while getopts "i:r:b:f:a:t:c:p:e:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    a) ABS_TOL=${OPTARG} ;;
+    t) REL_TOL=${OPTARG} ;;
+    c) COMPARE_ECL_COMMAND=${OPTARG} ;;
+    p) OPM_PACK_COMMAND=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 BASE_NAME=${FILENAME}_RESTART.DATA
diff --git a/tests/run-test.sh b/tests/run-test.sh
index 9b79476d2c..f5bdebef81 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -2,13 +2,32 @@
 
 # This simply runs a simulator.
 
-INPUT_DATA_PATH="$1"
-RESULT_PATH="$2"
-BINPATH="$3"
-EXE_NAME="$4"
-FILENAME="$5"
-MPI_PROCS="$6"
-shift 7
+if test $# -eq 0
+then
+  echo -e "Usage:\t$0 <options> -- [additional simulator options]"
+  echo -e "\tMandatory options:"
+  echo -e "\t\t -i <path>     Path to read deck from"
+  echo -e "\t\t -r <path>     Path to store results in"
+  echo -e "\t\t -b <path>     Path to simulator binary"
+  echo -e "\t\t -f <filename> Deck file name"
+  echo -e "\t\t -e <filename> Simulator binary to use"
+  echo -e "\t\t -n <procs >   Number of MPI processes to use"
+  exit 1
+fi
+
+OPTIND=1
+while getopts "i:r:b:f:e:n:" OPT
+do
+  case "${OPT}" in
+    i) INPUT_DATA_PATH=${OPTARG} ;;
+    r) RESULT_PATH=${OPTARG} ;;
+    b) BINPATH=${OPTARG} ;;
+    f) FILENAME=${OPTARG} ;;
+    e) EXE_NAME=${OPTARG} ;;
+    n) MPI_PROCS=${OPTARG} ;;
+  esac
+done
+shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
 mkdir -p ${RESULT_PATH}