diff --git a/core/c/jbigi/mbuild-all.sh b/core/c/jbigi/mbuild-all.sh
index fde67f4717..b36153ae42 100755
--- a/core/c/jbigi/mbuild-all.sh
+++ b/core/c/jbigi/mbuild-all.sh
@@ -84,7 +84,7 @@ if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
     exit 1
 fi
 
-if ! command -v m4 > /dev/null; then
+if ! command m4 > /dev/null; then
     printf "\aWARNING: \`m4\` not found. Install m4 " >&2
     printf "and re-run this script.\n\n\n\a" >&2
     exit 1
@@ -140,7 +140,7 @@ else
   exit 1
 fi
 
-if ! command -v ${CC} > /dev/null; then
+if ! command ${CC} > /dev/null; then
   echo "The compiler you've selected \"$CC\" does not appear to exist"
   exit 1
 fi
diff --git a/tests/scripts/checkremotecerts.sh b/tests/scripts/checkremotecerts.sh
index 14d0d86272..2501f02e49 100755
--- a/tests/scripts/checkremotecerts.sh
+++ b/tests/scripts/checkremotecerts.sh
@@ -123,16 +123,16 @@ check_hosts() {
             OLDIFS=$IFS
             IFS=":"
             set -- $HOST
-            HOSTNAME=$1
+            HOSTNAM=$1
             PORT=$2
             IFS=$OLDIFS
         else
-            HOSTNAME=$HOST
+            HOSTNAM=$HOST
             PORT=443
         fi
 
-        echo -n "Checking $HOSTNAME:$PORT..."
-        if retry connect "$HOSTNAME" "$PORT"  < /dev/null 1> "$WORK/$HOST"; then
+        echo -n "Checking $HOSTNAM:$PORT..."
+        if retry connect "$HOSTNAM" "$PORT"  < /dev/null 1> "$WORK/$HOST"; then
 
             # OpenSSL returns "return code: 0 (ok)"
             # GnuTLS returns "certificate is trusted"
diff --git a/tests/scripts/checkscripts.sh b/tests/scripts/checkscripts.sh
index 8f952a34fc..e1f4b8d259 100755
--- a/tests/scripts/checkscripts.sh
+++ b/tests/scripts/checkscripts.sh
@@ -13,45 +13,37 @@ SCRIPTFILES="\
 	./apps/desktopgui/bundle-messages.sh \
 	./apps/i2psnark/java/bundle-messages.sh \
 	./apps/i2psnark/launch-i2psnark \
-	./apps/i2ptunnel/java/bundle-messages-proxy.sh \
-	./apps/i2ptunnel/java/bundle-messages.sh \
-	./apps/routerconsole/java/bundle-messages-news.sh \
-	./apps/routerconsole/java/bundle-messages.sh \
+	./apps/i2ptunnel/java/bundle-messages*.sh \
+	./apps/ministreaming/java/bundle-messages.sh \
+	./apps/routerconsole/java/bundle-messages*.sh \
 	./apps/sam/c/examples/i2p-ping/pinger.sh \
 	./apps/susidns/src/bundle-messages.sh \
 	./apps/susimail/bundle-messages.sh \
-	./core/c/build.sh \
-	./core/c/jbigi/build-all.sh \
-	./core/c/jbigi/build_jbigi.sh \
-	./core/c/jbigi/build.sh \
-	./core/c/jbigi/mbuild-all.sh \
-	./core/c/jcpuid/build.sh \
-	./core/c/mbuild.sh \
-	./debian/i2p.config \
-	./debian/i2p-doc.preinst \
-	./debian/i2p.init \
-	./debian/i2p.postinst \
-	./debian/i2p.postrm \
-	./debian/i2p.preinst \
-	./debian/libjbigi-jni.preinst \
-	./debian/repack.sh \
+	./core/c/*.sh \
+	./core/c/jbigi/*.sh \
+	./debian/*.config \
+	./debian/*.init \
+	./debian/*.preinst \
+	./debian/*.postinst \
+	./debian/*.postrm \
+	./Docker.entrypoint.sh
+	./installer/resources/*.sh \
+	./installer/resources/eepget \
+	./installer/resources/i2prouter \
 	./installer/resources/install_i2p_service_osx.command \
 	./installer/resources/install_i2p_service_unix \
 	./installer/resources/locale/bundle-messages.sh \
-	./installer/resources/postinstall.sh \
-	./installer/resources/runplain.sh \
 	./installer/resources/uninstall_i2p_service_osx.command
 	./installer/resources/uninstall_i2p_service_unix \
+	./launchers/macosx/check_latest_java.sh \
+	./launchers/macosx/download_and_build_sparkle.sh \
 	./Slackware/i2p/i2p.SlackBuild \
 	./Slackware/i2p/doinst.sh \
 	./Slackware/i2p/rc.i2p \
-	./tests/scripts/checkcerts.sh \
-	./tests/scripts/checkpo.sh \
-	./tests/scripts/checkutf8.sh \
-	./tests/scripts/checkxml.sh \
-	./tests/scripts/testjbigi.sh \
+	./tests/scripts/*.sh \
 "
 
+echo "Checking scripts for bashisms ..."
 for script in $SCRIPTFILES; do
     #echo "Checking $script ..."
     if sh -n "$script" ; then : ; else