diff --git a/eng/build.sh b/eng/build.sh
index 2b97fd0ba50bea..799138f574696a 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -170,7 +170,7 @@ declare -a actions=("b" "build" "r" "restore" "rebuild" "testnobuild" "sign" "pu
 actInt=($(comm -12 <(printf '%s\n' "${actions[@]/#/-}" | sort) <(printf '%s\n' "${@/#--/-}" | sort)))
 firstArgumentChecked=0
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
 
   if [[ $firstArgumentChecked -eq 0 && $opt =~ ^[a-zA-Z.+]+$ ]]; then
diff --git a/eng/docker/build-docker-sdk.sh b/eng/docker/build-docker-sdk.sh
index a5256123b56dd2..54af435d35c16e 100755
--- a/eng/docker/build-docker-sdk.sh
+++ b/eng/docker/build-docker-sdk.sh
@@ -28,7 +28,7 @@ major_version=$(grep -oP '(?<=<MajorVersion>).*?(?=</MajorVersion>)' "$repo_root
 minor_version=$(grep -oP '(?<=<MinorVersion>).*?(?=</MinorVersion>)' "$repo_root/eng/Versions.props")
 version="$major_version.$minor_version"
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -imagename|-t)
diff --git a/eng/pipelines/evaluate-changed-darc-deps.sh b/eng/pipelines/evaluate-changed-darc-deps.sh
index b4181a1e503474..bbf96e32d7642a 100755
--- a/eng/pipelines/evaluate-changed-darc-deps.sh
+++ b/eng/pipelines/evaluate-changed-darc-deps.sh
@@ -50,7 +50,7 @@ eng_root=`cd -P "$scriptroot/.." && pwd`
 azure_variable_prefix=''
 diff_target=''
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -help|-h)
diff --git a/eng/pipelines/evaluate-changed-paths.sh b/eng/pipelines/evaluate-changed-paths.sh
index 37b9e5aa9177b7..6fe2dc5f0b4e36 100755
--- a/eng/pipelines/evaluate-changed-paths.sh
+++ b/eng/pipelines/evaluate-changed-paths.sh
@@ -66,7 +66,7 @@ azure_variable=''
 diff_target=''
 combined=false
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -help|-h)
diff --git a/eng/testing/RunnerTemplate.sh b/eng/testing/RunnerTemplate.sh
index 191f3e7d9a4a96..4c358d28bcc47d 100644
--- a/eng/testing/RunnerTemplate.sh
+++ b/eng/testing/RunnerTemplate.sh
@@ -14,7 +14,7 @@ EXECUTION_DIR=$(dirname "$0")
 RUNTIME_PATH=''
 RSP_FILE=''
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     --help|-h)
@@ -80,7 +80,7 @@ function invoke_xunitlogchecker {
 
   total_dumps=$(find $dump_folder -name "*.dmp" | wc -l)
 
-  if [[ $total_dumps > 0 ]]; then
+  if [[ $total_dumps -gt 0 ]]; then
     echo "Total dumps found in $dump_folder: $total_dumps"
     xunitlogchecker_file_name="$HELIX_CORRELATION_PAYLOAD/XUnitLogChecker"
 
diff --git a/src/coreclr/run-cppcheck.sh b/src/coreclr/run-cppcheck.sh
index 0f2de2426d0dd1..db284c1ee1880c 100755
--- a/src/coreclr/run-cppcheck.sh
+++ b/src/coreclr/run-cppcheck.sh
@@ -49,7 +49,7 @@ else
   NumProc=$(($(getconf _NPROCESSORS_ONLN)+1))
 fi
 
-while [[ $# > 0 ]]
+while [[ $# -gt 0 ]]
 do
     opt="$1"
     shift
diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
index 34aada4b04b508..6b50a01f5d2ffa 100755
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
@@ -41,7 +41,7 @@ fi
 
 dumpssharepath="$projectdir/dumps"
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(printf "%s" "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -dumpssharepath|-d)