diff --git a/bin/docker-image-tool.sh b/bin/docker-image-tool.sh
index e9e4338b5dc..509da0afb24 100755
--- a/bin/docker-image-tool.sh
+++ b/bin/docker-image-tool.sh
@@ -227,8 +227,7 @@ Examples:
 EOF
 }
 
-# shellcheck disable=SC2199
-if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
+if [[ "$*" = *--help ]] || [[ "$*" = *-h ]]; then
   usage
   exit 0
 fi
diff --git a/bin/kyuubi b/bin/kyuubi
index 414bdeb86ce..3ebfad46fb7 100755
--- a/bin/kyuubi
+++ b/bin/kyuubi
@@ -30,8 +30,7 @@ function usage() {
   echo "    -h | --help  - Show this help message"
 }
 
-# shellcheck disable=SC2199
-if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
+if [[ "$*" = *--help ]] || [[ "$*" = *-h ]]; then
   usage
   exit 0
 fi
diff --git a/bin/kyuubi-logo b/bin/kyuubi-logo
index 15a45a4bbc0..1f95ca02e52 100755
--- a/bin/kyuubi-logo
+++ b/bin/kyuubi-logo
@@ -15,18 +15,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 # Bugzilla 37848: When no TTY is available, don't output to console
 have_tty=0
-# shellcheck disable=SC2006
-if [[ "`tty`" != "not a tty" ]]; then
+if [[ "$(tty)" != "not a tty" ]]; then
     have_tty=1
 fi
 
 # Bugzilla 37848: When no TTY is available, don't output to console
 have_tty=0
-# shellcheck disable=SC2006
-if [[ "`tty`" != "not a tty" ]]; then
+if [[ "$(tty)" != "not a tty" ]]; then
     have_tty=1
 fi
 
diff --git a/bin/stop-application.sh b/bin/stop-application.sh
index b208ab50527..000eb4cdd7c 100755
--- a/bin/stop-application.sh
+++ b/bin/stop-application.sh
@@ -16,8 +16,7 @@
 # limitations under the License.
 #
 
-# shellcheck disable=SC2071
-if [[ $# < 1 ]] ; then
+if [[ $# -lt 1 ]] ; then
   echo "USAGE: $0 <application_id>"
   exit 1
 fi