diff --git a/.travis.yml b/.travis.yml
index 47e045fb..fa18945d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,10 @@ env:
   - GO15VENDOREXPERIMENT=1
 
 install:
-   - go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
+   - go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide github.com/ory/go-acc
    - glide install
 
 script:
-  - touch ./coverage.tmp
-  - |
-    echo 'mode: atomic' > coverage.txt
-  - |
-    go list ./... | grep -v /vendor | grep -v /internal | xargs -n1 -I{} sh -c 'go test -race -covermode=atomic -coverprofile=coverage.tmp -coverpkg $(go list ./... | grep -v /vendor | grep -v /internal | tr "\n" ",") {} && tail -n +2 coverage.tmp >> coverage.txt || exit 255' && rm coverage.tmp
+  - ./scripts/test-format.sh
+  - go-acc -o coverage.txt $(glide novendor)
   - goveralls -coverprofile="coverage.txt"