diff --git a/.travis.yml b/.travis.yml
index 75ef04e7f3..b3bb5af9ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,13 @@
 language: go
 sudo: false
 go:
-- 1.3
+- 1.4.2
+- 1.5
 install:
 - export GOPATH=${TRAVIS_BUILD_DIR}/Godeps/_workspace:$GOPATH
 - export PATH=${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH
 - go get -t -v ./...
-- go get code.google.com/p/go.tools/cmd/cover
+- go get golang.org/x/tools/cmd/cover
 script:
 - script/validate-dco
 - script/validate-gofmt
diff --git a/Dockerfile b/Dockerfile
index 2154e54f89..00bb5f639d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.4.2-cross
+FROM golang:1.5
 
 # TODO: Vendor these `go get` commands using Godep.
 RUN go get github.com/mitchellh/gox
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 18dd12df0b..ea0efa94cf 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/docker/machine",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.5",
 	"Deps": [
 		{
 			"ImportPath": "code.google.com/p/goauth2/oauth",