diff --git a/daemon/test/scripts/setup.sh b/daemon/test/scripts/setup.sh
index e7ada945c..af6208344 100755
--- a/daemon/test/scripts/setup.sh
+++ b/daemon/test/scripts/setup.sh
@@ -11,10 +11,16 @@ fi
 rm -rf $DATADIR
 mkdir $DATADIR
 
+# Find a free port (racy, but hey)
+PORT=`findport 18332`
+RPCPORT=`findport $(($PORT + 1))`
+
 # Create appropriate config file so cmdline matches.
 cat > $DATADIR/bitcoin.conf <<EOF
 regtest=1
 testnet=0
+rpcport=$RPCPORT
+port=$PORT
 EOF
 
 $DAEMON &
diff --git a/daemon/test/scripts/vars.sh b/daemon/test/scripts/vars.sh
index 08cd463f9..e8c8a04b3 100644
--- a/daemon/test/scripts/vars.sh
+++ b/daemon/test/scripts/vars.sh
@@ -11,4 +11,10 @@ else
 	SEQ_ENFORCEMENT=false
 fi
 
+findport()
+{
+    PORT=$1
+    while netstat -ntl | grep -q ":$PORT "; do PORT=$(($PORT + 1)); done
+    echo $PORT
+}
 #PREFIX="valgrind --vgdb-error=1"
diff --git a/daemon/test/test.sh b/daemon/test/test.sh
index 679823b92..2c242d952 100755
--- a/daemon/test/test.sh
+++ b/daemon/test/test.sh
@@ -352,9 +352,7 @@ cp $DIR2/config $DIR3/config
 if [ x"$RECONNECT" = xrestart ]; then
     # Make sure node2 restarts on same port, by setting in config.
     # Find a free TCP port.
-    port=4000
-    while netstat -ntl | grep -q ":$port "; do port=$(($port + 1)); done
-    echo port=$port >> $DIR2/config
+    echo port=`findport 4000` >> $DIR2/config
 fi
 
 if [ -n "$DIFFERENT_FEES" ]; then