diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e45d6edf..a917a1c791 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 0.6.0 (???)
 
+Make the basecli command the only way to use client-side, to enforce best
+security practices. Lots of enhancements to get it up to production quality.
+
 BREAKING CHANGES:
 - basecli
   - `basecli proof state get` -> `basecli query key`
diff --git a/Makefile b/Makefile
index ef3a3e6849..b61cc2ffd5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,7 @@ test_unit:
 	go test $(PACKAGES)
 	#go run tests/tendermint/*.go
 
-test_cli:
-	wget "https://raw.githubusercontent.com/kward/shunit2/master/source/2.1/src/shunit2" \
-		-q -O tests/cli/shunit2
+test_cli: tests/cli/shunit2
 	# sudo apt-get install jq
 	@./tests/cli/basictx.sh
 	@./tests/cli/counter.sh
@@ -36,6 +34,10 @@ build-docker:
 		"/go/src/github.com/tendermint/basecoin" -e "CGO_ENABLED=0" golang:alpine go build ./cmd/basecoin
 	docker build -t "tendermint/basecoin" .
 
+tests/cli/shunit2:
+	wget "https://raw.githubusercontent.com/kward/shunit2/master/source/2.1/src/shunit2" \
+		-q -O tests/cli/shunit2
+
 tools:
 	go get -u -v $(GOTOOLS)