diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index a05e63d7..c67e9873 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -97,8 +97,8 @@ if [ -z "$SKIP_DEVSTACK_GATE_PROJECT" ]; then
 fi
 
 # Make a directory to store logs
-rm -rf logs
-mkdir -p logs
+rm -rf $WORKSPACE/logs
+mkdir -p $WORKSPACE/logs
 
 # Set to 1 to run the Tempest test suite
 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
diff --git a/functions.sh b/functions.sh
index 1e113e1e..da5b6168 100644
--- a/functions.sh
+++ b/functions.sh
@@ -294,7 +294,7 @@ function setup_host {
     sudo start rsyslog
 
     # We set some home directories under $BASE, make sure it exists.
-    sudo mkdir $BASE
+    sudo mkdir -p $BASE
     # Create a stack user for devstack to run as, so that we can
     # revoke sudo permissions from that user when appropriate.
     sudo useradd -U -s /bin/bash -d $BASE/new -m stack