diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ff0464e4..ab773382b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,6 +61,23 @@ jobs:
             export PATH="$GOBIN:$PATH"
             bash tests/test_app/test.sh
 
+# XXX: if this test fails, fix it and update the docs at:
+# https://github.com/tendermint/tendermint/blob/develop/docs/abci-cli.rst
+  test_cli:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - restore_cache:
+          key: v1-pkg-cache
+      - restore_cache:
+          key: v1-tree-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Run cli tests
+          command: |
+            export PATH="$GOBIN:$PATH"
+            bash tests/test_cli/test.sh
+
   test_cover:
     <<: *defaults
     parallelism: 4
@@ -114,6 +131,9 @@ workflows:
       - test_apps:
           requires:
             - setup_dependencies
+      - test_cli:
+          requires:
+            - setup_dependencies
       - upload_coverage:
           requires:
             - test_cover
diff --git a/Makefile b/Makefile
index d5aa5365a..1823812ea 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,11 @@ test_apps:
 	@ bash tests/test_app/test.sh
 
 test_cli:
-	# test the cli against the examples in the tutorial at tendermint.com
+	# test the cli against the examples in the tutorial at:
+	# http://tendermint.readthedocs.io/projects/tools/en/master/abci-cli.html
+	#
+	# XXX: if this test fails, fix it and update the docs at:
+	# https://github.com/tendermint/tendermint/blob/develop/docs/abci-cli.rst
 	@ bash tests/test_cli/test.sh
 
 ########################################
diff --git a/tests/test_cli/ex1.abci.out b/tests/test_cli/ex1.abci.out
index 6e3440712..5d4c196dc 100644
--- a/tests/test_cli/ex1.abci.out
+++ b/tests/test_cli/ex1.abci.out
@@ -10,6 +10,7 @@
 
 > commit 
 -> code: OK
+-> data.hex: 0x0000000000000000
 
 > deliver_tx "abc"
 -> code: OK
@@ -21,7 +22,7 @@
 
 > commit 
 -> code: OK
--> data.hex: 0x49DFD15CCDACDEAE9728CB01FBB5E8688CA58B91
+-> data.hex: 0x0200000000000000
 
 > query "abc"
 -> code: OK
@@ -35,7 +36,7 @@
 
 > commit 
 -> code: OK
--> data.hex: 0x70102DB32280373FBF3F9F89DA2A20CE2CD62B0B
+-> data.hex: 0x0400000000000000
 
 > query "def"
 -> code: OK
diff --git a/tests/test_cli/ex2.abci.out b/tests/test_cli/ex2.abci.out
index 741dd7b72..5bceb85d8 100644
--- a/tests/test_cli/ex2.abci.out
+++ b/tests/test_cli/ex2.abci.out
@@ -1,5 +1,6 @@
 > set_option serial on
 -> code: OK
+-> log: OK (SetOption doesn't return anything.)
 
 > check_tx 0x00
 -> code: OK