diff --git a/Makefile b/Makefile
index e73849878..3b005ea36 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,8 @@
 
 all: test
 
-test: get_deps
-	go test --race github.com/tendermint/go-rpc/...
-	cd ./test && bash test.sh
-
+test: 
+	bash ./test/test.sh
 
 get_deps:
 	go get -t -u github.com/tendermint/go-rpc/...
diff --git a/circle.yml b/circle.yml
index f022d5a6b..1b3c8c609 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,10 +14,6 @@ checkout:
     # - git submodule sync
     # - git submodule update --init # use submodules
 
-dependencies:
-  override:
-    - "cd $REPO && make get_deps"
-
 test:
   override:
     - "cd $REPO && make test"
diff --git a/test/test.sh b/test/test.sh
index c38059016..f5e740241 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,4 +1,16 @@
 #! /bin/bash
+
+cd $GOPATH/src/github.com/tendermint/go-rpc
+
+# get deps
+go get -u -t ./...
+
+# go tests
+go test --race github.com/tendermint/go-rpc/...
+
+
+# integration tests
+cd test
 set -e
 
 go build -o server main.go