diff --git a/scripts/run b/scripts/run
index bf9172df81..7aa3ad1a8e 100755
--- a/scripts/run
+++ b/scripts/run
@@ -36,8 +36,9 @@ for i in "$@"; do
       ARGS+=("$i")
     fi
 done
-echo Database has its data in data-$PID
-echo Logfile is in log-$PID
+mkdir out
+echo Database has its data in out${PS}data-$PID
+echo Logfile is in out${PS}log-$PID
 $VG bin/arangod \
     --configuration none \
     --cluster.agent-path bin${PS}etcd-arango${EXT} \
@@ -48,8 +49,8 @@ $VG bin/arangod \
     --cluster.disable-dispatcher-kickstarter false \
     --cluster.data-path cluster \
     --cluster.log-path cluster \
-    --database.directory data-$PID \
-    --log.file log-$PID \
+    --database.directory out${PS}data-$PID \
+    --log.file out${PS}log-$PID \
     --server.endpoint tcp://127.0.0.1:$PORT \
     --javascript.startup-directory js \
     --javascript.app-path js${PS}apps \
@@ -60,11 +61,11 @@ $VG bin/arangod \
     $VXML
 
 if test $? -eq 0; then
-  echo removing log-$PID data-$PID
-  rm -rf log-$PID data-$PID
+  echo removing out${PS}log-$PID out${PS}data-$PID
+  rm -rf out${PS}log-$PID out${PS}data-$PID
 else
-  echo "failed - don't remove log-$PID data-$PID - heres the logfile:"
-  cat log-$PID
+  echo "failed - don't remove out${PS}log-$PID out${PS}data-$PID - heres the logfile:"
+  cat out${PS}log-$PID
 fi
 
 echo Server has terminated.
diff --git a/scripts/unittest.js b/scripts/unittest.js
index ee411a3b1c..c06074123b 100644
--- a/scripts/unittest.js
+++ b/scripts/unittest.js
@@ -156,11 +156,11 @@ function main (argv) {
     print(JSON.stringify(r));
   }
 
-  fs.write("UNITTEST_RESULT.json", JSON.stringify(r));
-  fs.write("UNITTEST_RESULT_SUMMARY.txt", JSON.stringify(! r.crashed));
+  fs.write("out/UNITTEST_RESULT.json", JSON.stringify(r));
+  fs.write("out/UNITTEST_RESULT_SUMMARY.txt", JSON.stringify(! r.crashed));
 
   try {
-    resultsToXml(r, "UNITTEST_RESULT_", (options.hasOwnProperty('cluster') && options.cluster));
+    resultsToXml(r, "out/UNITTEST_RESULT_", (options.hasOwnProperty('cluster') && options.cluster));
   }
   catch (x) {
     print("exception while serializing status xml!");