diff --git a/plugins/common/functions b/plugins/common/functions
index b5838af23..7a0c96213 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -148,14 +148,14 @@ dokku_log_exit() {
 dokku_log_fail_quiet() {
   declare desc="log fail formatter"
   if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
-    echo " !     $@" 1>&2
+    echo " !     $*" 1>&2
   fi
   exit 1
 }
 
 dokku_log_fail() {
   declare desc="log fail formatter"
-  echo " !     $@" 1>&2
+  echo " !     $*" 1>&2
   exit 1
 }
 
diff --git a/tests/apps/dockerfile-entrypoint/entrypoint b/tests/apps/dockerfile-entrypoint/entrypoint
index 1b4625f4f..680d30a20 100755
--- a/tests/apps/dockerfile-entrypoint/entrypoint
+++ b/tests/apps/dockerfile-entrypoint/entrypoint
@@ -2,7 +2,7 @@
 set -o pipefail
 
 if [[ "$1" == touch* ]]; then
-  echo "entrypoint script started with arguments $@"
+  echo "entrypoint script started with arguments $*"
   touch "$(echo $@ | awk '{print $2}')"
 else
   exec "$@"