diff --git a/.travis.yml b/.travis.yml
index d0ec9fd..b91e036 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,8 @@ before_install:
   - dep ensure
 script:
   - ./pilosa-master-linux-amd64/pilosa server --metric.diagnostics=false -b https://:20101 -d https_data --tls.skip-verify --tls.certificate test.pilosa.local.crt --tls.key test.pilosa.local.key --cluster.disabled static &
-  - PILOSA_BIND="https://:20101" make test-all
+  - PILOSA_BIND="https://:20101" make test-all-race
   - pkill pilosa
   - ./pilosa-master-linux-amd64/pilosa server --metric.diagnostics=false -d http_data &
+  - GOARCH=386 make test-all
   - $HOME/gopath/bin/goveralls -service=travis-ci -ignore "gopilosa_pbuf/public.pb.go" -flags="-tags=integration fullcoverage"
diff --git a/Makefile b/Makefile
index 9225976..b3f53ff 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@ test:
 	go test
 
 test-all:
+	go test -tags=integration -v
+
+test-all-race:
 	go test -race -tags=integration -v
 
 release: