diff --git a/circle.yml b/circle.yml
index 671ea14c..2b54c66b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,7 +30,7 @@ dependencies:
 test:
   override:
     - "cd $REPO && make test_integrations":
-        timeout: 1200
+        timeout: 1800
   post:
     - "cd $REPO && bash <(curl -s https://codecov.io/bash)"
 
diff --git a/test/test_cover.sh b/test/test_cover.sh
index 52d45dc5..5b97b9d9 100644
--- a/test/test_cover.sh
+++ b/test/test_cover.sh
@@ -5,7 +5,7 @@ PKGS=$(go list github.com/tendermint/tendermint/... | grep -v /vendor/)
 set -e
 echo "mode: atomic" > coverage.txt
 for pkg in ${PKGS[@]}; do
-	go test -race -coverprofile=profile.out -covermode=atomic $pkg
+	go test -timeout 20m -race -coverprofile=profile.out -covermode=atomic $pkg
 	if [ -f profile.out ]; then
 		tail -n +2 profile.out >> coverage.txt;
 		rm profile.out