diff --git a/Makefile b/Makefile
index 20fb8a236..0f8adc5b6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ install: get_deps
 
 test:
 	go test github.com/tendermint/tmsp/...
+	bash tests/test_counter/test.sh
 
 get_deps:
 	go get -d github.com/tendermint/tmsp/...
diff --git a/circle.yml b/circle.yml
index 548dcc3e9..33e50dc71 100644
--- a/circle.yml
+++ b/circle.yml
@@ -20,5 +20,4 @@ dependencies:
 
 test:
   override:
-    - "cd $REPO && go test ./..."
-    - "cd $REPO && bash tests/test_counter/test.sh"
+    - "cd $REPO && make test"
diff --git a/tests/test_counter/test.sh b/tests/test_counter/test.sh
index 7acd5d146..4883a5e0e 100755
--- a/tests/test_counter/test.sh
+++ b/tests/test_counter/test.sh
@@ -10,4 +10,5 @@ COUNTER_APP="counter" go run test_counter.go
 COUNTER_APP="counter -tmsp=grpc" go run test_counter.go -tmsp=grpc
 
 # test nodejs counter
+# TODO: fix node app
 #COUNTER_APP="node $GOPATH/src/github.com/tendermint/js-tmsp/example/app.js" go run test_counter.go