diff --git a/2004/hibachi/src/localhost/test/shell/test2.sh b/2004/hibachi/src/localhost/test/shell/test2.sh
index c20ef7ea1..7ec83e5b3 100755
--- a/2004/hibachi/src/localhost/test/shell/test2.sh
+++ b/2004/hibachi/src/localhost/test/shell/test2.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 cat <<'-EOT-'
 HTTP/1.0 200 OK
@@ -27,38 +27,40 @@ Hibachi/1.0 Shell Test 2
 <caption><h3>Assertions</h3></caption>
 -EOT-
 
-if [ X"$PATH" = X'/usr/local/bin:/usr/bin:/bin' ]; then
+if [[ "$PATH" = '/usr/local/bin:/usr/bin:/bin' ]]; then
 
 	echo "<tr><td>[ OK  ] PATH</td></tr>"
 else
 	echo "<tr><td>[ BAD ] PATH</td></tr>"
 fi
 
-if [ X"$ENV" = X ]; then
+if [[ -z "$ENV" ]]; then
 	echo "<tr><td>[ OK  ] ENV</td></tr>"
 else
 	echo "<tr><td>[ BAD ] ENV</td></tr>"
 fi
 
-if [ X"$CDPATH" = X ]; then
+if [[ -z "$CDPATH" ]]; then
 	echo "<tr><td>[ OK  ] CDPATH</td></tr>"
 else
 	echo "<tr><td>[ BAD ] CDPATH</td></tr>"
 fi
 
-if [ X"$REQUEST_METHOD" = X'POST' ]; then
+if [[ -z $REQUEST_METHOD ]]; then REQUEST_METHOD=''; fi
+if [[ "$REQUEST_METHOD" = 'POST' ]]; then
 	echo "<tr><td>[ OK  ] REQUEST_METHOD</td></tr>"
 else
 	echo "<tr><td>[ BAD ] REQUEST_METHOD</td></tr>"
 fi
 
-if [ X"$QUERY_STRING" = X ]; then
+if [[ -z "$QUERY_STRING" ]]; then
 	echo "<tr><td>[ OK  ] QUERY_STRING</td></tr>"
 else
 	echo "<tr><td>[ BAD ] QUERY_STRING</td></tr>"
 fi
 
-if [ X"$HTTP_COOKIE" = X'cookie1=test1.sh; cookie2=test1.sh' -o X"$HTTP_COOKIE" = X'cookie2=test1.sh; cookie1=test1.sh' ]; then
+if [[ -z $HTTP_COOKIE ]]; then HTTP_COOKIE=''; fi
+if [[ "$HTTP_COOKIE" == 'cookie1=test1.sh; cookie2=test1.sh' || "$HTTP_COOKIE" == 'cookie2=test1.sh; cookie1=test1.sh' ]]; then
 	echo "<tr><td>[ OK  ] HTTP_COOKIE</td></tr>"
 else
 	echo "<tr><td>[ BAD ] HTTP_COOKIE</td></tr>"
@@ -66,7 +68,13 @@ fi
 
 echo "</table>"
 
-. "$DOCUMENT_ROOT/test/shell/dump.sh"
+if [[ -z $DOCUMENT_ROOT ]]; then DOCUMENT_ROOT='.'; fi
+# We want to source the file, but for SC1091 the file is not available at the time of this edit.
+#
+# SC1091 (info): Not following: ./test/shell/dump.sh was not specified as input (see shellcheck -x).
+# https://www.shellcheck.net/wiki/SC1091
+# shellcheck disable=SC1091
+source "$DOCUMENT_ROOT/test/shell/dump.sh"
 
 cat <<'-EOT-'
 </div>