diff --git a/.travis.yml b/.travis.yml
index bf5b49d63e..f94108ccc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.5.3
+  - 1.5.4
 
 # let us have speedy Docker-based Travis workers
 sudo: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index de6df94ccf..f302127c77 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@ sudo apt-get install git
 
 You also need Go 1.5 or higher.  Download Go from [https://golang.org/dl/](https://golang.org/dl/).  To install on Linux:
 ```sh
-tar xzvf go1.5.3.linux-amd64.tar.gz
+tar xzvf go1.5.4.linux-amd64.tar.gz
 sudo mv go /usr/local
 ```
 
diff --git a/Dockerfile b/Dockerfile
index 657aaf0342..8c8c3c0f76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5.3-alpine
+FROM golang:1.5.4-alpine
 
 ARG GOOS
 
diff --git a/test/integration/Dockerfile b/test/integration/Dockerfile
index cb8f70b028..5eb8bbeb28 100644
--- a/test/integration/Dockerfile
+++ b/test/integration/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git file parall
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install golang
-ENV GO_VERSION 1.5.3
+ENV GO_VERSION 1.5.4
 RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local -xz
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go