diff --git a/.travis.yml b/.travis.yml
index 0eddb1cb..d7108cd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
 language: go
 
 go:
-  - 1.5.3
-  - 1.6
+  - 1.5.4
+  - 1.6.3
+
+go_import_path: google.golang.org/grpc
 
 before_install:
   - go get golang.org/x/tools/cmd/goimports
@@ -11,10 +13,6 @@ before_install:
   - go get github.com/mattn/goveralls
   - go get golang.org/x/tools/cmd/cover
 
-install:
-  - mkdir -p "$GOPATH/src/google.golang.org"
-  - mv "$TRAVIS_BUILD_DIR" "$GOPATH/src/google.golang.org/grpc"
-
 script:
   - '! gofmt -s -d -l . 2>&1 | read'
   - '! goimports -l . | read'