diff --git a/.travis.yml b/.travis.yml
index abf4a8f..42b299f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,22 @@
+sudo: false
 language: go
 go:
- - 1.4
- - 1.5
- - tip
-install: go get -v ./github
-script: go test -v ./github
+  - 1.5.4
+  - 1.6.2
+  - tip
+matrix:
+  include:
+    - go: 1.4.3
+      script:
+        - go get -t -v ./...
+        - go test -v -race ./...
+  allow_failures:
+    - go: tip
+  fast_finish: true
+install:
+  - # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step).
+script:
+  - go get -t -v ./...
+  - diff -u <(echo -n) <(gofmt -d -s .)
+  - go tool vet .
+  - go test -v -race ./...