diff --git a/.travis.yml b/.travis.yml
index 32f8400d..21402c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,12 @@ go:
   - 1.3
   - release
   - tip
+before_install:
+  - gotools=golang.org/x/tools
+  - if [ "$TRAVIS_GO_VERSION" = "release" ] || [ "$TRAVIS_GO_VERSION" = "go1.3.3" ]; then gotools=code.google.com/p/go.tools; fi
 install:
   - go get -d -t -v ./...
-  - if [ "$TRAVIS_GO_VERSION" = "go1.3.3" ]; then go get -v code.google.com/p/go.tools/cmd/vet; else go get -v golang.org/x/tools/cmd/vet; fi
+  - go get $gotools/cmd/vet
   - go get -v github.com/GeertJohan/fgt
   - go get -v github.com/golang/lint/golint
 script: