diff --git a/scripts/start-hyperopt-worker.sh b/scripts/start-hyperopt-worker.sh
index ffe4753cb..1b0d240ca 100755
--- a/scripts/start-hyperopt-worker.sh
+++ b/scripts/start-hyperopt-worker.sh
@@ -1,5 +1,12 @@
-#!/bin/bash
+#!/bin/bash -e
 
 DB_NAME=freqtrade_hyperopt
 
-hyperopt-mongo-worker --mongo=127.0.0.1:1234/${DB_NAME} --poll-interval=0.1
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+WORK_DIR="${DIR}/../.hyperopt/worker"
+
+mkdir -p "${WORK_DIR}"
+hyperopt-mongo-worker \
+    --mongo="127.0.0.1:1234/${DB_NAME}" \
+    --poll-interval=0.1 \
+    --workdir="${WORK_DIR}"
\ No newline at end of file
diff --git a/scripts/start-mongodb.sh b/scripts/start-mongodb.sh
index 5a1758d04..02b6624f4 100755
--- a/scripts/start-mongodb.sh
+++ b/scripts/start-mongodb.sh
@@ -1,10 +1,10 @@
 #!/bin/bash -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DB_PATH="${DIR}/../.mongodb"
+DB_PATH="${DIR}/../.hyperopt/mongodb"
 
-mkdir -p ${DB_PATH}
-mongod --dbpath ${DB_PATH} \
+mkdir -p "${DB_PATH}"
+mongod --dbpath "${DB_PATH}" \
     --bind_ip 127.0.0.1 \
     --port 1234 \
     --directoryperdb \