diff --git a/test/run.sh b/test/run.sh
index 6939c28544..42c384286d 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -10,11 +10,13 @@ RF_VENV="${ROOTDIR}/_output/robotenv"
 RF_VARIABLES="${SCRIPTDIR}/variables.yaml"
 DRYRUN=false
 OUTDIR="${ROOTDIR}/_output/e2e-$(date +%Y%m%d-%H%M%S)"
+RANDOMIZE=all
+EXITONFAILURE=""
 
 function usage {
     local -r script_name=$(basename "$0")
     cat - <<EOF
-${script_name} [-h] [-n] [-o output_dir] [-v venv_dir] [-i var_file] [-s name=value] [-k test_names] [test suite files]
+${script_name} [-h] [-n] [-o output_dir] [-v venv_dir] [-i var_file] [-s name=value] [-k test_names] [-r randomize_value] [-x] [test suite files]
 
 Options:
 
@@ -25,10 +27,12 @@ Options:
   -i PATH            The variables file. (${RF_VARIABLES})
   -s NAME=VALUE      To enable a stress condition.
   -k SKIP_TESTS      Comma separated list of tests to skip.
+  -r RANDOMIZE       Define RF Test order (${RANDOMIZE})
+  -x                 Stops test execution if any test fails. The remaining tests are marked as failed without actually executing them.
 EOF
 }
 
-while getopts "hno:v:i:s:k:" opt; do
+while getopts "hno:v:i:s:k:r:x" opt; do
     case ${opt} in
         h)
             usage
@@ -52,6 +56,12 @@ while getopts "hno:v:i:s:k:" opt; do
         k)
             SKIP_TESTS=${OPTARG}
             ;;
+        r)
+            RANDOMIZE=${OPTARG}
+            ;;
+        x)
+            EXITONFAILURE="--exitonfailure"
+            ;;
         *)
             usage
             exit 1
@@ -104,7 +114,8 @@ if ${DRYRUN}; then
 else
     # shellcheck disable=SC2086,SC2068
     "${RF_BINARY}" \
-        --randomize all \
+        ${EXITONFAILURE}  \
+        --randomize "${RANDOMIZE}" \
         --prerunmodifier "${SCRIPTDIR}/resources/SkipTests.py:${SKIP_TESTS:-}" \
         --loglevel TRACE \
         -V "${RF_VARIABLES}" \