diff --git a/bin/tests/system/legacy.run.sh.in b/bin/tests/system/legacy.run.sh.in
index e468d517b1..50af41c41d 100644
--- a/bin/tests/system/legacy.run.sh.in
+++ b/bin/tests/system/legacy.run.sh.in
@@ -44,11 +44,8 @@ else
     clean=true
 fi
 
-do_run=false
 restart=false
-log_flags="-r"
-while getopts "sknp:r-:t" OPT; do
-    log_flags="$log_flags -$OPT$OPTARG"
+while getopts "sknp:-:t" OPT; do
     if [ "$OPT" = "-" ] && [ -n "$OPTARG" ]; then
         OPT="${OPTARG%%=*}"
         OPTARG="${OPTARG#$OPT}"
@@ -60,7 +57,6 @@ while getopts "sknp:r-:t" OPT; do
         k | keep) stopservers=false ;;
         n | noclean) clean=false ;;
         p | port) baseport=$OPTARG ;;
-        r | run) do_run=true ;;
         s | skip) exit 77 ;;
         t | restart) restart=true ;;
         -) break ;;
@@ -70,31 +66,6 @@ done
 
 shift $((OPTIND-1))
 
-if ! $do_run; then
-    if [ "$baseport" -eq 0 ]; then
-        log_flags="$log_flags -p 5300"
-    fi
-    env - \
-        SYSTEMTEST_FORCE_COLOR="$SYSTEMTEST_FORCE_COLOR" \
-        SYSTEMTEST_NO_CLEAN="$SYSTEMTEST_NO_CLEAN" \
-        SLOT="$SLOT" \
-        ${OPENSSL_CONF:+OPENSSL_CONF="$OPENSSL_CONF"} \
-        SOFTHSM2_CONF="$SOFTHSM2_CONF" \
-        PATH="$PATH" \
-        ${LD_LIBRARY_PATH:+"LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"} \
-        TESTS="$*" \
-        TEST_SUITE_LOG=run.log \
-        LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" \
-        LOG_FLAGS="$log_flags" \
-        TEST_LARGE_MAP="${TEST_LARGE_MAP}" \
-        CI_ENABLE_ALL_TESTS="${CI_ENABLE_ALL_TESTS}" \
-	${TSAN_OPTIONS:+"TSAN_OPTIONS=${TSAN_OPTIONS}"} \
-	${VIRTUAL_ENV:+"VIRTUAL_ENV=${VIRTUAL_ENV}"} \
-	${PERL5LIB:+"PERL5LIB=${PERL5LIB}"} \
-        make -e check
-    exit $?
-fi
-
 if [ $# -eq 0 ]; then
     echofail "Usage: $0 [-k] [-n] [-p <PORT>] test-directory [test-options]" >&2;
     exit 1