diff --git a/test-cli/scripts/generate-block.sh b/test-cli/scripts/generate-block.sh
index 5969edfd0..1d53ee41d 100755
--- a/test-cli/scripts/generate-block.sh
+++ b/test-cli/scripts/generate-block.sh
@@ -4,6 +4,7 @@
 set -e
 
 . `dirname $0`/vars.sh
+INIT=$1
 
 case $STYLE in
     alpha)
@@ -11,6 +12,11 @@ case $STYLE in
 	$CLI setgenerate true
 	;;
     bitcoin)
-	$CLI generate 1
+	# Initially we need 100 blocks so coinbase matures, giving us funds.
+	if [ -n "$INIT" ]; then
+	    $CLI generate 101
+	else
+	    $CLI generate 1
+	fi
 	;;
 esac
diff --git a/test-cli/scripts/setup.sh b/test-cli/scripts/setup.sh
new file mode 100755
index 000000000..4f095f902
--- /dev/null
+++ b/test-cli/scripts/setup.sh
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+
+. `dirname $0`/vars.sh
+
+if $CLI getinfo 2>/dev/null; then
+    echo $DAEMON already running >&2
+    exit 1
+fi
+
+# Start clean
+rm -rf $DATADIR/$REGTESTDIR
+
+$DAEMON &
+i=0
+while ! $CLI getinfo >/dev/null 2>&1; do
+    if [ $i -gt 30 ]; then
+	echo $DAEMON start failed? >&1
+	exit 1
+    fi
+    sleep 1
+    i=$(($i + 1))
+done
+    
+scripts/generate-block.sh init
+
+A1=`scripts/get-new-address.sh`
+A2=`scripts/get-new-address.sh`
+TX=`$CLI sendmany "" "{ \"$A1\":10, \"$A2\":10 }"`
+scripts/generate-block.sh
+
+# Find the inputs numbers corresponding to those 10 btc outs
+echo "Arguments to test.sh:"
+for i in $(seq 1 $($CLI listunspent | grep -c txid) ); do scripts/getinput.sh $i | grep -q "$TX.*/1000000000/" && echo -n "$i "; done
+echo
diff --git a/test-cli/scripts/vars.sh b/test-cli/scripts/vars.sh
index be0c59c6e..b228b5933 100644
--- a/test-cli/scripts/vars.sh
+++ b/test-cli/scripts/vars.sh
@@ -1,7 +1,14 @@
 # Sourced by other scripts
-CLI="bitcoin-cli -regtest"
 STYLE=bitcoin
-#CLI="alpha-cli -regtest -testnet=0"
+CLI="bitcoin-cli -regtest"
+DATADIR=$HOME/.bitcoin
+REGTESTDIR=regtest
+DAEMON=bitcoind
+
 #STYLE=alpha
+#DATADIR=$HOME/.alpha
+#REGTESTDIR=alpharegtest
+#CLI="alpha-cli -datadir=$DATADIR -regtest -testnet=0"
+#DAEMON="alphad -datadir=$DATADIR"
 
 #PREFIX="valgrind --vgdb-error=1"