diff --git a/lib/dpl/assets/atlas/install b/lib/dpl/assets/atlas/install
index 79c3e8d7d..902b47a42 100644
--- a/lib/dpl/assets/atlas/install
+++ b/lib/dpl/assets/atlas/install
@@ -7,7 +7,7 @@ if ! command -v atlas-upload &>/dev/null ; then
     chmod +x $HOME/bin/gimme
   fi
 
-  if [ -z $GOPATH ]; then
+  if [ -z "$GOPATH" ]; then
     export GOPATH="$HOME/gopath"
   else
     export GOPATH="$HOME/gopath:$GOPATH"
diff --git a/lib/dpl/assets/pypi/install b/lib/dpl/assets/pypi/install
index 484c46fe7..aa9e4397a 100644
--- a/lib/dpl/assets/pypi/install
+++ b/lib/dpl/assets/pypi/install
@@ -1,4 +1,4 @@
 #!/bin/bash
-if [ -z ${VIRTUAL_ENV+x} ]; then export PIP_USER=yes; fi &&
+if [ -z "${VIRTUAL_ENV}" ]; then export PIP_USER=yes; fi &&
 wget -nv -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel &&
 pip install --upgrade --ignore-installed %{setuptools_arg} %{twine_arg} %{wheel_arg}