diff --git a/scripts/run_metrics.sh b/scripts/run_metrics.sh
index f19e9489e..721d93919 100755
--- a/scripts/run_metrics.sh
+++ b/scripts/run_metrics.sh
@@ -14,7 +14,7 @@ process_common_args "$@"
 # For now these values are default for kvm
 features=""
 
-if [ "$hypervisor" = "mshv" ] ;  then
+if [ "$hypervisor" = "mshv" ]; then
     features="--no-default-features --features mshv,common"
 fi
 
@@ -60,7 +60,7 @@ fi
 
 if [ ! -f "$VMLINUX_IMAGE" ]; then
     pushd $LINUX_CUSTOM_DIR
-    time make bzImage -j `nproc`
+    time make bzImage -j $(nproc)
     cp vmlinux $VMLINUX_IMAGE || exit 1
     popd
 fi
@@ -87,6 +87,10 @@ strip target/$BUILD_TARGET/release/performance-metrics
 echo 6144 | sudo tee /proc/sys/vm/nr_hugepages
 sudo chmod a+rwX /dev/hugepages
 
+if [ -n "$test_filter" ]; then
+    test_binary_args+=("--test-filter $test_filter")
+fi
+
 export RUST_BACKTRACE=1
 time target/$BUILD_TARGET/release/performance-metrics ${test_binary_args[*]}
 RES=$?
diff --git a/scripts/test-util.sh b/scripts/test-util.sh
index 9964b738d..1a4c1d564 100644
--- a/scripts/test-util.sh
+++ b/scripts/test-util.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 hypervisor="kvm"
 test_filter=""
-test_binary_args=()
 
 cmd_help() {
     echo ""
@@ -44,5 +43,5 @@ process_common_args() {
         die "Hypervisor value must be kvm or mshv"
     fi
 
-    test_binary_args="$@"
+    test_binary_args=($@)
 }