diff --git a/.circleci/config.yml b/.circleci/config.yml
index d147c6ac2..3ff0464e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
           paths:
             - /go/src/github.com/tendermint/abci
 
-  test_integration:
+  test_apps:
     <<: *defaults
     steps:
       - attach_workspace:
@@ -56,10 +56,10 @@ jobs:
       - restore_cache:
           key: v1-tree-{{ .Environment.CIRCLE_SHA1 }}
       - run:
-          name: Run integration tests
+          name: Run apps tests
           command: |
             export PATH="$GOBIN:$PATH"
-            bash tests/test.sh
+            bash tests/test_app/test.sh
 
   test_cover:
     <<: *defaults
@@ -111,9 +111,9 @@ workflows:
       - test_cover:
           requires:
             - setup_dependencies
-      - test_integration:
+      - test_apps:
           requires:
             - setup_dependencies
       - upload_coverage:
           requires:
-            - test_integration
+            - test_cover
diff --git a/Makefile b/Makefile
index 64a989a87..13a9547ce 100644
--- a/Makefile
+++ b/Makefile
@@ -82,9 +82,20 @@ test_race:
 	@echo "==> Running go test --race"
 	@go test -v -race $(PACKAGES)
 
-test_integrations:
-	@bash test.sh
+### three tests tested by Jenkins
+test_cover:
+	@ bash tests/test_cover.sh
 
+test_apps:
+	# test the counter using a go test script
+	@ bash tests/test_app/test.sh
+
+test_cli:
+	# test the cli against the examples in the tutorial at tendermint.com
+	@ bash tests/test_cli/test.sh
+
+fmt:
+	@ go fmt ./...
 
 ########################################
 ### Formatting, linting, and vetting
diff --git a/tests/test.sh b/tests/test.sh
deleted file mode 100755
index 416145fc9..000000000
--- a/tests/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-set -e
-
-# test the counter using a go test script
-bash tests/test_app/test.sh
-
-# test the cli against the examples in the tutorial at tendermint.com
-# TODO: make these less fragile
-# bash tests/test_cli/test.sh
-
-
diff --git a/test.sh b/tests/test_cover.sh
similarity index 57%
rename from test.sh
rename to tests/test_cover.sh
index 978b26e1f..abbbbe563 100755
--- a/test.sh
+++ b/tests/test_cover.sh
@@ -11,9 +11,3 @@ for d in $(go list ./... | grep -v vendor); do
         rm profile.out
     fi
 done
-
-echo "==> Running integration tests (./tests)"
-find . -path ./vendor -prune -o -name "*.sock" -exec rm {} \;
-# tests/test.sh requires that we run the installed cmds, must not be out of date
-make install
-bash tests/test.sh