diff --git a/Makefile b/Makefile
index 84c4e11f40..906b3b6015 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ test_unit:
 
 test_cli: tests/cli/shunit2
 	# sudo apt-get install jq
+	./tests/cli/keys.sh
+	./tests/cli/rpc.sh
+	./tests/cli/init.sh
 	./tests/cli/basictx.sh
 	./tests/cli/counter.sh
 	./tests/cli/restart.sh
diff --git a/tests/cli/init.sh b/tests/cli/init.sh
new file mode 100755
index 0000000000..a5a3bb387c
--- /dev/null
+++ b/tests/cli/init.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+CLIENT_EXE=basecli
+SERVER_EXE=basecoin
+
+oneTimeSetUp() {
+  BASE=~/.bc_init_test
+  rm -rf "$BASE"
+  mkdir -p "$BASE"
+
+  SERVER="${BASE}/server"
+  SERVER_LOG="${BASE}/${SERVER_EXE}.log"
+
+  HEX="deadbeef1234deadbeef1234deadbeef1234aaaa"
+  ${SERVER_EXE} init ${HEX} --home="$SERVER" >> "$SERVER_LOG"
+  if ! assertTrue $?; then return 1; fi
+
+  GENESIS_FILE=${SERVER}/genesis.json
+  CHAIN_ID=$(cat ${GENESIS_FILE} | jq .chain_id | tr -d \")
+
+  printf "starting ${SERVER_EXE}...\n"
+  ${SERVER_EXE} start --home="$SERVER" >> "$SERVER_LOG" 2>&1 &
+  sleep 5
+  PID_SERVER=$!
+  disown
+  if ! ps $PID_SERVER >/dev/null; then
+    echo "**STARTUP FAILED**"
+    cat $SERVER_LOG
+    return 1
+  fi
+}
+
+oneTimeTearDown() {
+  printf "\nstopping ${SERVER_EXE}..."
+  kill -9 $PID_SERVER >/dev/null 2>&1
+  sleep 1
+}
+
+test01goodInit() {
+  export BCHOME=${BASE}/client-01
+  assertFalse "ls ${BCHOME} 2>/dev/null >&2"
+
+  echo y | ${CLIENT_EXE} init --node=tcp://localhost:46657 --chain-id="${CHAIN_ID}" > /dev/null
+  assertTrue "initialized light-client" $?
+  checkDir $BCHOME 3
+}
+
+test02badInit() {
+  export BCHOME=${BASE}/client-02
+  assertFalse "ls ${BCHOME} 2>/dev/null >&2"
+
+  # no node where we go
+  echo y | ${CLIENT_EXE} init --node=tcp://localhost:9999 --chain-id="${CHAIN_ID}" > /dev/null 2>&1
+  assertFalse "invalid init" $?
+  # dir there, but empty...
+  checkDir $BCHOME 0
+
+  # try with invalid chain id
+  echo y | ${CLIENT_EXE} init --node=tcp://localhost:46657 --chain-id="bad-chain-id" > /dev/null 2>&1
+  assertFalse "invalid init" $?
+  checkDir $BCHOME 0
+
+  # reject the response
+  echo n | ${CLIENT_EXE} init --node=tcp://localhost:46657 --chain-id="${CHAIN_ID}" > /dev/null 2>&1
+  assertFalse "invalid init" $?
+  checkDir $BCHOME 0
+}
+
+test03noDoubleInit() {
+  export BCHOME=${BASE}/client-03
+  assertFalse "ls ${BCHOME} 2>/dev/null >&2"
+
+  # init properly
+  echo y | ${CLIENT_EXE} init --node=tcp://localhost:46657 --chain-id="${CHAIN_ID}" > /dev/null 2>&1
+  assertTrue "initialized light-client" $?
+  checkDir $BCHOME 3
+
+  # try again, and we get an error
+  echo y | ${CLIENT_EXE} init --node=tcp://localhost:46657 --chain-id="${CHAIN_ID}" > /dev/null 2>&1
+  assertFalse "warning on re-init" $?
+  checkDir $BCHOME 3
+
+  # unless we --force-reset
+  echo y | ${CLIENT_EXE} init --force-reset --node=tcp://localhost:46657 --chain-id="${CHAIN_ID}" > /dev/null 2>&1
+  assertTrue "re-initialized light-client" $?
+  checkDir $BCHOME 3
+}
+
+test04acceptGenesisFile() {
+  export BCHOME=${BASE}/client-04
+  assertFalse "ls ${BCHOME} 2>/dev/null >&2"
+
+  # init properly
+  ${CLIENT_EXE} init --node=tcp://localhost:46657 --genesis=${GENESIS_FILE} > /dev/null 2>&1
+  assertTrue "initialized light-client" $?
+  checkDir $BCHOME 3
+}
+
+# XXX Ex: checkDir $DIR $FILES
+# Makes sure directory exists and has the given number of files
+checkDir() {
+  assertTrue "ls ${1} 2>/dev/null >&2"
+  assertEquals "no files created" "$2" $(ls $1 | wc -l)
+}
+
+# load and run these tests with shunit2!
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
+. $DIR/shunit2
diff --git a/tests/cli/keys.sh b/tests/cli/keys.sh
new file mode 100755
index 0000000000..4cf9e61d12
--- /dev/null
+++ b/tests/cli/keys.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+CLIENT_EXE=basecli
+
+
+oneTimeSetUp() {
+  PASS=qwertyuiop
+  export BCHOME=$HOME/.bc_keys_test
+  ${CLIENT_EXE} reset_all
+  assertTrue $?
+}
+
+newKey(){
+  assertNotNull "keyname required" "$1"
+  KEYPASS=${2:-qwertyuiop}
+  echo $KEYPASS | ${CLIENT_EXE} keys new $1 >/dev/null 2>&1
+  assertTrue "created $1" $?
+}
+
+testMakeKeys() {
+  USER=demouser
+  assertFalse "already user $USER" "${CLIENT_EXE} keys get $USER"
+  newKey $USER
+  assertTrue "no user $USER" "${CLIENT_EXE} keys get $USER"
+}
+
+# load and run these tests with shunit2!
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
+. $DIR/shunit2
diff --git a/tests/cli/rpc.sh b/tests/cli/rpc.sh
new file mode 100755
index 0000000000..eb764089a5
--- /dev/null
+++ b/tests/cli/rpc.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+CLIENT_EXE=basecli
+SERVER_EXE=basecoin
+
+oneTimeSetUp() {
+  BASE=~/.bc_init_test
+  rm -rf "$BASE"
+  mkdir -p "$BASE"
+
+  SERVER="${BASE}/server"
+  SERVER_LOG="${BASE}/${SERVER_EXE}.log"
+
+  HEX="deadbeef1234deadbeef1234deadbeef1234aaaa"
+  ${SERVER_EXE} init ${HEX} --home="$SERVER" >> "$SERVER_LOG"
+  if ! assertTrue $?; then return 1; fi
+
+  GENESIS_FILE=${SERVER}/genesis.json
+  CHAIN_ID=$(cat ${GENESIS_FILE} | jq .chain_id | tr -d \")
+
+  printf "starting ${SERVER_EXE}...\n"
+  ${SERVER_EXE} start --home="$SERVER" >> "$SERVER_LOG" 2>&1 &
+  sleep 5
+  PID_SERVER=$!
+  disown
+  if ! ps $PID_SERVER >/dev/null; then
+    echo "**STARTUP FAILED**"
+    cat $SERVER_LOG
+    return 1
+  fi
+
+  # this sets the base for all client queries in the tests
+  export BCHOME=${BASE}/client
+  ${CLIENT_EXE} init --node=tcp://localhost:46657 --genesis=${GENESIS_FILE} > /dev/null 2>&1
+  if ! assertTrue "initialized light-client" "$?"; then
+    return 1
+  fi
+}
+
+oneTimeTearDown() {
+  printf "\nstopping ${SERVER_EXE}..."
+  kill -9 $PID_SERVER >/dev/null 2>&1
+  sleep 1
+}
+
+test01getInsecure() {
+  GENESIS=$(${CLIENT_EXE} rpc genesis)
+  assertTrue "get genesis" "$?"
+  MYCHAIN=$(echo ${GENESIS} | jq .genesis.chain_id | tr -d \")
+  assertEquals "genesis chain matches" "${CHAIN_ID}" "${MYCHAIN}"
+
+  STATUS=$(${CLIENT_EXE} rpc status)
+  assertTrue "get status" "$?"
+  SHEIGHT=$(echo ${STATUS} | jq .latest_block_height)
+  assertTrue "parsed status" "$?"
+  assertNotNull "has a height" "${SHEIGHT}"
+
+  VALS=$(${CLIENT_EXE} rpc validators)
+  assertTrue "get validators" "$?"
+  VHEIGHT=$(echo ${VALS} | jq .block_height)
+  assertTrue "parsed validators" "$?"
+  assertTrue "sensible heights: $SHEIGHT / $VHEIGHT" "test $VHEIGHT -ge $SHEIGHT"
+  VCNT=$(echo ${VALS} | jq '.validators | length')
+  assertEquals "one validator" "1" "$VCNT"
+
+  INFO=$(${CLIENT_EXE} rpc info)
+  assertTrue "get info" "$?"
+  DATA=$(echo $INFO | jq .response.data)
+  assertEquals "basecoin info" '"Basecoin v0.6.1"' "$DATA"
+}
+
+test02getSecure() {
+  HEIGHT=$(${CLIENT_EXE} rpc status | jq .latest_block_height)
+  assertTrue "get status" "$?"
+
+  # check block produces something reasonable
+  assertFalse "missing height" "${CLIENT_EXE} rpc block"
+  BLOCK=$(${CLIENT_EXE} rpc block --height=$HEIGHT)
+  assertTrue "get block" "$?"
+  MHEIGHT=$(echo $BLOCK | jq .block_meta.header.height)
+  assertEquals "meta height" "${HEIGHT}" "${MHEIGHT}"
+  BHEIGHT=$(echo $BLOCK | jq .block.header.height)
+  assertEquals "meta height" "${HEIGHT}" "${BHEIGHT}"
+
+  # check commit produces something reasonable
+  assertFalse "missing height" "${CLIENT_EXE} rpc commit"
+  let "CHEIGHT = $HEIGHT - 1"
+  COMMIT=$(${CLIENT_EXE} rpc commit --height=$CHEIGHT)
+  assertTrue "get commit" "$?"
+  HHEIGHT=$(echo $COMMIT | jq .header.height)
+  assertEquals "commit height" "${CHEIGHT}" "${HHEIGHT}"
+  assertEquals "canonical" "true" $(echo $COMMIT | jq .canonical)
+  BSIG=$(echo $BLOCK | jq .block.last_commit)
+  CSIG=$(echo $COMMIT | jq .commit)
+  assertEquals "block and commit" "$BSIG" "$CSIG"
+
+  # now let's get some headers
+  # assertFalse "missing height" "${CLIENT_EXE} rpc headers"
+  HEADERS=$(${CLIENT_EXE} rpc headers --min=$CHEIGHT --max=$HEIGHT)
+  assertTrue "get headers" "$?"
+  assertEquals "proper height" "$HEIGHT" $(echo $HEADERS | jq '.last_height')
+  assertEquals "two headers" "2" $(echo $HEADERS | jq '.block_metas | length')
+  # should we check these headers?
+  CHEAD=$(echo $COMMIT | jq .header)
+  # most recent first, so the commit header is second....
+  HHEAD=$(echo $HEADERS | jq .block_metas[1].header)
+  assertEquals "commit and header" "$CHEAD" "$HHEAD"
+}
+
+test03waiting() {
+  START=$(${CLIENT_EXE} rpc status | jq .latest_block_height)
+  assertTrue "get status" "$?"
+
+  let "NEXT = $START + 5"
+  assertFalse "no args" "${CLIENT_EXE} rpc wait"
+  assertFalse "too long" "${CLIENT_EXE} rpc wait --height=1234"
+  assertTrue "normal wait" "${CLIENT_EXE} rpc wait --height=$NEXT"
+
+  STEP=$(${CLIENT_EXE} rpc status | jq .latest_block_height)
+  assertEquals "wait until height" "$NEXT" "$STEP"
+
+  let "NEXT = $STEP + 3"
+  assertTrue "${CLIENT_EXE} rpc wait --delta=3"
+  STEP=$(${CLIENT_EXE} rpc status | jq .latest_block_height)
+  assertEquals "wait for delta" "$NEXT" "$STEP"
+}
+
+# load and run these tests with shunit2!
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
+. $DIR/shunit2