diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index 240190e9a..f4df36a52 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -247,7 +247,7 @@ SC2059,SC2068,SC2074,SC2086,SC2088,SC2089,SC2090,SC2091,SC2094,\
 SC2097,SC2098,SC2103,SC2115,SC2116,SC2119,SC2120,SC2121,SC2124,SC2126,SC2128,\
 SC2129,SC2140,SC2142,SC2143,SC2145,SC2146,SC2148,SC2152,SC2153,SC2154,SC2155,\
 SC2162,SC2164,SC2165,SC2166,SC2167,SC2174,SC2178,SC2181,SC2191,SC2192,SC2195,\
-SC2199,SC2206,SC2207,SC2214,SC2223,SC2230,SC2231,SC2235"
+SC2206,SC2207,SC2214,SC2223,SC2230,SC2231,SC2235"
 	# SPDK fails some error checks which have been deprecated in later versions of shellcheck.
 	# We will not try to fix these error checks, but instead just leave the error types here
 	# so that we can still run with older versions of shellcheck.
diff --git a/test/vhost/common.sh b/test/vhost/common.sh
index 8f2b9775e..a29ec8b41 100644
--- a/test/vhost/common.sh
+++ b/test/vhost/common.sh
@@ -899,7 +899,7 @@ function vm_wait_for_boot()
 
 	notice "Waiting for VMs to boot"
 	shift
-	if [[ "$@" == "" ]]; then
+	if [[ "$*" == 0 ]]; then
 		local vms_to_check="$VM_DIR/[0-9]*"
 	else
 		local vms_to_check=""