diff --git a/daemon/test/test.sh b/daemon/test/test.sh
index b35cf4a01..62756e9cc 100755
--- a/daemon/test/test.sh
+++ b/daemon/test/test.sh
@@ -129,17 +129,17 @@ all_ok()
 trap "echo Results in $DIR1 and $DIR2 >&2; cat $DIR1/errors $DIR2/errors >&2" EXIT
 mkdir $DIR1 $DIR2
 if [ -n "$GDB1" ]; then
-    echo Press return once you run: gdb --args daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR1
+    echo Press return once you run: gdb --args daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR1 --bitcoin-datadir=$DATADIR
     read REPLY
 else
-    $PREFIX ../daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR1 > $REDIR1 2> $REDIRERR1 &
+    $PREFIX ../daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR1 --bitcoin-datadir=$DATADIR > $REDIR1 2> $REDIRERR1 &
 fi
 
 if [ -n "$GDB2" ]; then
-    echo Press return once you run: gdb --args daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR2
+    echo Press return once you run: gdb --args daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR2 --bitcoin-datadir=$DATADIR
     read REPLY
 else
-    $PREFIX ../daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR2 > $REDIR2 2> $REDIRERR2 &
+    $PREFIX ../daemon/lightningd --log-level=debug --bitcoind-poll=1 --min-expiry=900 --lightning-dir=$DIR2 --bitcoin-datadir=$DATADIR > $REDIR2 2> $REDIRERR2 &
 fi
 
 i=0
diff --git a/test-cli/scripts/setup.sh b/test-cli/scripts/setup.sh
index 49e10f45d..a832bee2d 100755
--- a/test-cli/scripts/setup.sh
+++ b/test-cli/scripts/setup.sh
@@ -8,7 +8,15 @@ if $CLI getinfo 2>/dev/null; then
 fi
 
 # Start clean
-rm -rf $DATADIR/$REGTESTDIR
+rm -rf $DATADIR
+mkdir $DATADIR
+
+# Create appropriate config file so cmdline matches.
+cat > $DATADIR/bitcoin.conf <<EOF
+regtest=1
+testnet=0
+walletbroadcast=0
+EOF
 
 $DAEMON &
 i=0
diff --git a/test-cli/scripts/vars.sh b/test-cli/scripts/vars.sh
index 194da4e3b..6fbba2a2b 100644
--- a/test-cli/scripts/vars.sh
+++ b/test-cli/scripts/vars.sh
@@ -2,17 +2,17 @@
 
 if grep -q ^FEATURES.*ALPHA ../Makefile; then
     STYLE=alpha
-    DATADIR=$HOME/.alpha
+    DATADIR=/tmp/alpha-lightning
     REGTESTDIR=alpharegtest
-    CLI="alpha-cli -datadir=$DATADIR -regtest -testnet=0"
-    DAEMON="alphad -datadir=$DATADIR -regtest -testnet=0 -walletbroadcast=1"
+    CLI="alpha-cli -datadir=$DATADIR"
+    DAEMON="alphad -datadir=$DATADIR"
     SEQ_ENFORCEMENT=true
 else
     STYLE=bitcoin
-    CLI="bitcoin-cli -regtest -testnet=0"
-    DATADIR=$HOME/.bitcoin
+    DATADIR=/tmp/bitcoin-lightning
+    CLI="bitcoin-cli -datadir=$DATADIR"
     REGTESTDIR=regtest
-    DAEMON="bitcoind -regtest -testnet=0 -walletbroadcast=1"
+    DAEMON="bitcoind -datadir=$DATADIR"
     if grep ^FEATURES ../Makefile | cut -d'#' -f1 | grep -q BIP68; then
 	SEQ_ENFORCEMENT=true
     else