diff --git a/.travis.yml b/.travis.yml
index 12b28f18..e047d876 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,40 @@
 language: go
 
 os:
-  - linux
+- linux
 
 go:
 - 1.10.1
+- 1.2
+- tip
 
 sudo: required
-
 env:
+  matrix:
   - DEP_VERSION="0.4.1"
+  global:
+    secure: wWW0QLPr3+jPP8gtRX12FdlMbhfsyfnTXx3aboCVIYKFd1p0+ng4jo4N5fNCLBBpK6JgH+NtTqvsXdGBFDoVHF5jo3qsxYneonh0eC9ffXD/Rbbp4CeHqBZKVOTyzxMvLM1HWzI4Ynq8VP5ktPx+O4enuXTUlZQ7NOtg4yplliEXIIueu/QNIxOd0lDLwy2k/lHjcWPHAKxEV0BAnRxSA4fe7I/1q3VQctGjVVS94HCsE5C3ecCzf3rAsxppyaNK1SoFmIWNDT5PDlBBONM1pzKEiDsZEIFLIBYfM0RCkEhXwwskFTPxRgN7/g8BIv/qD59MVc1/ywSsx+fFPUZRHH+zykFiD1aNKA2D9RP0sRYuaqCpxwq/+ZD6hh4t3bRfZ1tZq94FiSMHTfHaUFOvpHKSJf3lkpo8nGPw8exFkEi0mgeKyvFgN4Vj42bVsZklksZROwJuNMNUWLBNAr3dlZCZyGbh26CUFnq0izsI9HK1hQQDGRxeEBD+WTIvyAYEXdBzIHU+bnB1E7Mg7yuhYrLybRDIidypRSVieJ4WkAj766ILs4G/jHoVzw1RjH1qFHsycZellY52wVjd8BVSqhQDNTLivIMDOGA/UjXLEoKnvMu1pR3lzSQLHEcDPXfB8N+nZn3XoAVhFP7rxXdoafL6bjJJrzDeJvxGNJWZgYQ=
 
 before_install:
-  # Download the binary to bin folder in $GOPATH
-  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
-  # Make the binary executable
-  - chmod +x $GOPATH/bin/dep
+- curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64
+  -o $GOPATH/bin/dep
+- chmod +x $GOPATH/bin/dep
 
 install:
-# Download the dependencies
 - dep ensure
+- go get golang.org/x/tools/cmd/cover
+- go get github.com/mattn/goveralls
 
 script:
-# Ensure the parsers can generate and are up to date
 - go generate
-# Run the tests
-- go test -v ./...
+- go test -v -covermode=count -coverprofile=coverage.out ./..
+- "$HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken
+  $COVERALLS_TOKEN"
 
 before_deploy:
-# Grab the cross compiler
 - go get github.com/karalabe/xgo
-# Compile
-- ./build/ci/build.sh
-
+- "./build/ci/build.sh"
 
-# Deploy to Github release on tags
 deploy:
   provider: releases
   api_key:
@@ -44,8 +44,3 @@ deploy:
   skip_cleanup: true
   on:
     tags: true
-
-
-# Push code coverage information
-after_success:
-- bash <(curl -s https://codecov.io/bash)