diff --git a/scripts/tests.sh b/scripts/tests.sh
index 1dcf2ae01..964d00668 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -52,17 +52,32 @@ cleanup() {
 }
 trap cleanup INT TERM
 
-if [ "$1" = --junit_report ]
-then
-    if [ -z "$2" ]
-    then
-        echo "Usage: $0 [--junit_report <report_directory>]"
-        exit 1
-    fi
-    log_directory="$2"
-else
-    log_directory=""
-fi
+log_directory=""
+no_smt=""
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        --junit_report)
+            if [ -z "$2" ]
+            then
+                echo "Usage: $0 [--junit_report <report_directory>] [--no-smt]"
+                exit 1
+            else
+                log_directory="$2"
+            fi
+            shift
+            shift
+            ;;
+        --no-smt)
+            no_smt="--no-smt"
+            SMT_FLAGS+=(--no-smt)
+            shift
+            ;;
+        *)
+            echo "Usage: $0 [--junit_report <report_directory>] [--no-smt]"
+            exit 1
+    esac
+done
 
 printTask "Testing Python scripts..."
 "$REPO_ROOT/test/pyscriptTests.py"
@@ -74,7 +89,7 @@ then
     "$REPO_ROOT/test/cmdlineTests.sh" &
     CMDLINE_PID=$!
 else
-    if ! "$REPO_ROOT/test/cmdlineTests.sh"
+    if ! "$REPO_ROOT/test/cmdlineTests.sh" "$no_smt"
     then
         printError "Commandline tests FAILED"
         exit 1
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 5d87357f0..4d72040a6 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -37,8 +37,26 @@ source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
-AUTOUPDATE=false
-[[ $1 == --update ]] && AUTOUPDATE=true && shift
+autoupdate=false
+no_smt=false
+declare -a selected_tests
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        --update)
+            autoupdate=true
+            shift
+            ;;
+        --no-smt)
+            no_smt=true
+            shift
+            ;;
+        *)
+            selected_tests+=("$1")
+            shift
+            ;;
+    esac
+done
 
 case "$OSTYPE" in
     msys)
@@ -91,7 +109,7 @@ function ask_expectation_update
         local newExpectation="${1}"
         local expectationFile="${2}"
 
-        if [[ $AUTOUPDATE == true ]]
+        if [[ $autoupdate == true ]]
         then
             update_expectation "$newExpectation" "$expectationFile"
         else
@@ -302,18 +320,11 @@ test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "" "Invalid rem
 printTask "Running general commandline tests..."
 (
     cd "$REPO_ROOT"/test/cmdlineTests/
-    for tdir in ${*:-*/}
+    (( ${#selected_tests[@]} > 0 )) || selected_tests=(*)
+    for tdir in "${selected_tests[@]}"
     do
         if ! [[ -d $tdir ]]; then
-            if [[ $tdir =~ ^--.*$ ]]; then
-                if [[ $tdir == "--update" ]]; then
-                    printError "The --update option must be given before any positional arguments."
-                else
-                    printError "Invalid option: $tdir."
-                fi
-            else
-                printError "Test directory not found: $tdir"
-            fi
+            printError "Test directory not found: $tdir"
             exit 1
         fi
 
@@ -321,6 +332,13 @@ printTask "Running general commandline tests..."
 
         # Strip trailing slash from $tdir.
         tdir=$(basename "${tdir}")
+        if [[ $no_smt == true ]]
+        then
+            if [[ $tdir =~ .*model_checker_.* ]]; then
+                printWarning "  --- > skipped"
+                continue
+            fi
+        fi
 
         inputFiles="$(ls -1 "${tdir}/input."* 2> /dev/null || true)"
         inputCount="$(echo "${inputFiles}" | wc -w)"