diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index 28e8441a2..f211f8240 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -244,7 +244,7 @@ if hash shellcheck 2>/dev/null; then
 SC2010,SC2012,SC2016,SC2034,SC2045,SC2046,SC2068,SC2086,SC2089,SC2090,\
 SC2097,SC2098,SC2119,SC2120,SC2121,SC2124,SC2126,SC2128,\
 SC2129,SC2140,SC2142,SC2143,SC2148,SC2152,SC2153,SC2154,SC2155,\
-SC2162,SC2164,SC2165,SC2166"
+SC2162,SC2164,SC2165"
 	# 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/scripts/setup.sh b/scripts/setup.sh
index 29fc48830..f8619163b 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -561,7 +561,7 @@ function status_linux {
 		fi
 		device=$(cat /sys/bus/pci/devices/$bdf/device)
 		vendor=$(cat /sys/bus/pci/devices/$bdf/vendor)
-		if [ "$driver" = "nvme" -a -d /sys/bus/pci/devices/$bdf/nvme ]; then
+		if [ "$driver" = "nvme" ] && [ -d /sys/bus/pci/devices/$bdf/nvme ]; then
 			name="\t"$(ls /sys/bus/pci/devices/$bdf/nvme);
 		else
 			name="-";