diff --git a/api/build.sh b/api/build.sh
index f1601110f1..f3b9652a14 100755
--- a/api/build.sh
+++ b/api/build.sh
@@ -30,7 +30,7 @@ fi
 
 set -x
 export ENV=local
-pwd=`pwd`
+pwd=$(pwd)
 
 rm -rf output && mkdir -p output/conf && mkdir -p output/dag-to-lua
 
diff --git a/api/run.sh b/api/run.sh
index b7b3a2f811..71eae44bf4 100755
--- a/api/run.sh
+++ b/api/run.sh
@@ -17,8 +17,8 @@
 #
 
 export ENV=local
-pwd=`pwd`
+pwd=$(pwd)
 
-cd ./output
+cd ./output || exit
 
 exec ./manager-api
diff --git a/api/test/docker/setup.sh b/api/test/docker/setup.sh
index c328f822da..50d60ead66 100755
--- a/api/test/docker/setup.sh
+++ b/api/test/docker/setup.sh
@@ -17,7 +17,7 @@
 #
 
 #Executes commands from the intended directory "/api/test/docker".
-cd $(dirname $0)
+cd "$(dirname "$0")"
 
 main() {
   #welcome message & check machine configuration
@@ -57,7 +57,7 @@ main() {
   done
 
   if [ $UP -eq 1 ]; then
-    up $UPFLAG
+    up "$UPFLAG"
   fi
   echo "Execution complete."
 }