diff --git a/.travis.yml b/.travis.yml
index 7759ad70f6..499ef6c6c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ go:
   - tip
 install:
   - go get -d -t -v ./...
-  - go get -v code.google.com/p/go.tools/cmd/cover
+  - ./get_ci_cover.sh
 script:
   - go test -v -covermode=count -coverprofile=profile.cov
 after_success:
diff --git a/get_ci_cover.sh b/get_ci_cover.sh
new file mode 100755
index 0000000000..0aaaba512e
--- /dev/null
+++ b/get_ci_cover.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+set -x
+if [ "$TRAVIS_GO_VERSION" = "tip" ]; then
+	go get -v golang.org/x/tools/cmd/cover
+else
+	go get -v code.google.com/p/go.tools/cmd/cover
+fi