diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh
index c455ae568..9a35fc372 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -243,8 +243,8 @@ cmd_build() {
     ensure_latest_ctr
 
     process_volumes_args
-    if [[ "$hypervisor" != "kvm" ]]; then
-        die "Hypervisor value must be kvm"
+    if [[ ! ("$hypervisor" = "kvm" ||  "$hypervisor" = "mshv") ]]; then
+        die "Hypervisor value must be kvm or mshv"
     fi
     if [[ "$hypervisor" = "mshv" ]]; then
         exported_device="/dev/mshv"
@@ -336,12 +336,14 @@ cmd_tests() {
 	esac
 	shift
     done
-    if [[ "$hypervisor" != "kvm" ]]; then
-        die "Hypervisor value must be kvm"
+    if [[ ! ("$hypervisor" = "kvm" ||  "$hypervisor" = "mshv") ]]; then
+        die "Hypervisor value must be kvm or mshv"
     fi
+
     if [[ "$hypervisor" = "mshv" ]]; then
         exported_device="/dev/mshv"
     fi
+
     set -- "$@" '--hypervisor' $hypervisor
 
     ensure_build_dir
diff --git a/scripts/run_integration_tests_sgx.sh b/scripts/run_integration_tests_sgx.sh
index b8d83e161..9d4c7eaa4 100755
--- a/scripts/run_integration_tests_sgx.sh
+++ b/scripts/run_integration_tests_sgx.sh
@@ -5,6 +5,12 @@ source $HOME/.cargo/env
 source $(dirname "$0")/test-util.sh
 
 process_common_args "$@"
+
+if [[ "$hypervisor" = "mshv" ]]; then
+    echo "Unsupported SGX test for MSHV"
+    exit 1
+fi
+
 # For now these values are deafult for kvm
 features_build=""
 features_test="--features integration_tests"
diff --git a/scripts/test-util.sh b/scripts/test-util.sh
index 360e4f6d7..4c25f9033 100644
--- a/scripts/test-util.sh
+++ b/scripts/test-util.sh
@@ -33,8 +33,7 @@ process_common_args() {
 	esac
 	shift
     done
-    if [[ "$hypervisor" != "kvm" ]]; then
-        echo "Hypervisor value must be kvm"
-        exit 1
+    if [[ ! ("$hypervisor" = "kvm" ||  "$hypervisor" = "mshv") ]]; then
+        die "Hypervisor value must be kvm or mshv"
     fi
 }