diff --git a/Dockerfile b/Dockerfile
index b641c4b46..96d42cd92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ ENV GX_IPFS   ""
 # The IPFS fs-repo within the container
 ENV IPFS_PATH /data/ipfs
 # Golang stuff
-ENV GO_VERSION 1.5.3-r0
+ENV GO_VERSION 1.5.4-r0
 ENV GOPATH     /go
 ENV PATH       /go/bin:$PATH
 ENV SRC_PATH   /go/src/github.com/ipfs/go-ipfs
diff --git a/test/Dockerfile b/test/Dockerfile
index 61a4a2c1f..a67aca735 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -16,7 +16,7 @@ EXPOSE 8080
 
 ENV GX_IPFS   ""
 ENV IPFS_PATH /data/ipfs
-ENV GO_VERSION 1.5.3-r0
+ENV GO_VERSION 1.5.4-r0
 ENV GOPATH     /go
 ENV PATH       /go/bin:$PATH
 ENV SRC_PATH   /go/src/github.com/ipfs/go-ipfs