diff --git a/setup.sh b/setup.sh
index 02f3a953..ccaed653 100755
--- a/setup.sh
+++ b/setup.sh
@@ -146,7 +146,7 @@ function _run_in_new_container
 
   ${CRI} run --rm "${USE_TTY}" \
     -v "${CONFIG_PATH}:${DMS_CONFIG}${USE_SELINUX}" \
-    "${IMAGE_NAME}" "${@:+$@}"
+    "${IMAGE_NAME}" "${@}"
 }
 
 function _main
@@ -226,9 +226,9 @@ function _main
 
   if [[ -n ${CONTAINER_NAME} ]]
   then
-    ${CRI} exec "${USE_TTY}" "${CONTAINER_NAME}" setup "${@:+$@}"
+    ${CRI} exec "${USE_TTY}" "${CONTAINER_NAME}" setup "${@}"
   else
-    _run_in_new_container setup "${@:+$@}"
+    _run_in_new_container setup "${@}"
   fi
 
   [[ ${1} == 'help' ]] && _show_local_usage
@@ -236,4 +236,4 @@ function _main
   return 0
 }
 
-_main "${@:+$@}"
+_main "${@}"
diff --git a/test/linting/lint.sh b/test/linting/lint.sh
index b67e6c5f..c7e125f8 100755
--- a/test/linting/lint.sh
+++ b/test/linting/lint.sh
@@ -52,7 +52,7 @@ function __log_success
 
 function __in_path
 {
-  command -v "${@:+$@}" &>/dev/null && return 0 ; return 1 ;
+  command -v "${@}" &>/dev/null && return 0 ; return 1 ;
 }
 
 function _eclint
@@ -156,4 +156,4 @@ function __main
   esac
 }
 
-__main "${@:+$@}" || exit ${?}
+__main "${@}" || exit ${?}