diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh
index 2b162f84c..0a5cb87c0 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -270,8 +270,6 @@ cmd_build() {
     cargo_args=("$@")
     [ $build = "release" ] && cargo_args+=("--release")
     cargo_args+=(--target "$target")
-    [ "$(uname -m)" = "aarch64" ] && cargo_args+=("--no-default-features")
-    [ "$(uname -m)" = "aarch64" ] && cargo_args+=(--features "$hypervisor")
 
     rustflags=""
     target_cc=""
diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh
index 42b8f62fa..8c1b8f91a 100755
--- a/scripts/run_unit_tests.sh
+++ b/scripts/run_unit_tests.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 source $HOME/.cargo/env
-source  $(dirname "$0")/test-util.sh
+source $(dirname "$0")/test-util.sh
 
 process_common_args "$@"
 
 BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu}
 cargo_args=("")
 
-if [[ $(uname -m) = "aarch64" || $hypervisor = "mshv" ]]; then
+if [[ $hypervisor = "mshv" ]]; then
     cargo_args+=("--no-default-features")
-    cargo_args+=("--features $hypervisor")
+    cargo_args+=("--features common,$hypervisor")
 fi
 
 if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
@@ -19,4 +19,4 @@ if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
 fi
 
 export RUST_BACKTRACE=1
-cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1;
+cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1