diff --git a/src/cloud/ec2/bin/econe-server b/src/cloud/ec2/bin/econe-server
index e8f35d4dbd..5d045107e9 100755
--- a/src/cloud/ec2/bin/econe-server
+++ b/src/cloud/ec2/bin/econe-server
@@ -35,7 +35,7 @@ fi
 setup()
 {
     TMPDIR=$(grep ^:tmpdir: $ECONE_ETC|awk '{print $2}')
-    test -n $TMDIR && export TMPDIR
+    test -n "$TMPDIR" && export TMPDIR
     mkdir -p $TMPDIR
 
 	if [ -f $ECONE_LOCK_FILE ]; then
diff --git a/src/cloud/occi/bin/occi-server b/src/cloud/occi/bin/occi-server
index 9115b3d4bb..b13b45fdbd 100755
--- a/src/cloud/occi/bin/occi-server
+++ b/src/cloud/occi/bin/occi-server
@@ -35,7 +35,7 @@ fi
 setup()
 {
   TMPDIR=$(grep ^:tmpdir: $OCCI_ETC|awk '{print $2}')
-  test -n $TMDIR && export TMPDIR
+  test -n "$TMPDIR" && export TMPDIR
   mkdir -p $TMPDIR
 
   if [ -f $OCCI_LOCK_FILE ]; then
diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server
index fb0a435fed..8911b8c4c9 100755
--- a/src/sunstone/bin/sunstone-server
+++ b/src/sunstone/bin/sunstone-server
@@ -36,7 +36,7 @@ fi
 setup()
 {
   TMPDIR=$(grep ^:tmpdir: $SUNSTONE_CONF|awk '{print $2}')
-  test -n $TMDIR && export TMPDIR
+  test -n "$TMPDIR" && export TMPDIR
   mkdir -p $TMPDIR
 
   if [ -f $SUNSTONE_LOCK_FILE ]; then