diff --git a/Makefile b/Makefile
index 94736921b..6a3b2381f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ test: build
 test_race: build
 	go test -race `${NOVENDOR}`
 
-test_integrations:
+test_integrations: 
 	bash ./test/test.sh
 
 test100: build
diff --git a/circle.yml b/circle.yml
index ab7c23b96..95d5bfabd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -20,11 +20,9 @@ dependencies:
     - sudo service docker start
     - go version
     - docker version
-    - "cd $REPO && make get_vendor_deps"
 
 test:
   override:
-    - "cd $REPO && make test_race"
     - "cd $REPO && make test_integrations"
   post:
     - bash <(curl -s https://codecov.io/bash)
diff --git a/glide.lock b/glide.lock
index 4a4cbf9fd..ce3018940 100644
--- a/glide.lock
+++ b/glide.lock
@@ -45,7 +45,7 @@ imports:
   - leveldb/table
   - leveldb/util
 - name: github.com/tendermint/ed25519
-  version: fdac6641497281ed1cc368687ec6377e96e02b24
+  version: 1f52c6f8b8a5c7908aff4497c186af344b428925
   subpackages:
   - extra25519
   - edwards25519
diff --git a/test/Dockerfile b/test/Dockerfile
index 613780e99..9978d3674 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -1,8 +1,7 @@
 # Pull base image.
-FROM golang:1.5
-
-COPY test/test_libs.sh /
-COPY glide.lock /glide.lock
-
-ENV GLIDE /glide.lock
+FROM golang:1.6
 
+ENV TENDERMINT_ORG $GOPATH/src/github.com/tendermint/
+RUN mkdir -p $TENDERMINT_ORG
+COPY . $TENDERMINT_ORG/tendermint
+WORKDIR $TENDERMINT_ORG/tendermint
diff --git a/test/run_test.sh b/test/run_test.sh
new file mode 100644
index 000000000..67d1f23ca
--- /dev/null
+++ b/test/run_test.sh
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+echo `pwd`
+
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+echo "Current branch: $BRANCH"
+
+make get_vendor_deps
+
+make test_race
+
+if [[ "$BRANCH" == "master" || "$BRANCH" == "staging" ]]; then
+	bash test/test_libs.sh
+fi
diff --git a/test/test.sh b/test/test.sh
index b9d15d351..5c646c27a 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,14 +1,12 @@
 #! /bin/bash
 
-# integrations test!
-# if we pushed to STAGING or MASTER,
-# run the integrations tests.
-
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-echo "Current branch: $BRANCH"
-
-if [[ "$BRANCH" == "master" || "$BRANCH" == "staging" ]]; then
-	docker build -t tester -f ./test/Dockerfile .
-	docker run -t tester bash /test_libs.sh
-fi
-
+# integrations test
+# this is the script run by eg CircleCI.
+# It creates a docker container,
+# installs the dependencies,
+# and runs the tests.
+# If we pushed to STAGING or MASTER,
+# it will also run the tests for all dependencies
+
+docker build -t tester -f ./test/Dockerfile .
+docker run -t tester bash test/run_test.sh