diff --git a/bin/juju b/bin/juju
index 83eef6a..80ea83c 100755
--- a/bin/juju
+++ b/bin/juju
@@ -178,7 +178,7 @@ function execute_operation(){
 	fi
 }
 
-parse_arguments $@
+parse_arguments "$@"
 check_cli
 execute_operation
 # vim: set ts=4 sw=4 noet:
diff --git a/tests/test_juju.sh b/tests/test_juju.sh
index 38806f7..58d641a 100755
--- a/tests/test_juju.sh
+++ b/tests/test_juju.sh
@@ -34,7 +34,7 @@ function run_juju_as_user(){
 }
 
 function wrap_juju(){
-    parse_arguments $@
+    parse_arguments "$@"
     check_cli
     execute_operation
 }