diff --git a/Dockerfile b/Dockerfile
index bc3c78577..426954a11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.6-alpine
+FROM golang:1.7-alpine
 
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV DOCKER_BUILDTAGS include_oss include_gcs
diff --git a/circle.yml b/circle.yml
index 52348a4bc..61f8be0cb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,7 +8,7 @@ machine:
 
   post:
   # go
-    - gvm install go1.6 --prefer-binary --name=stable
+    - gvm install go1.7 --prefer-binary --name=stable
 
   environment:
   # Convenient shortcuts to "common" locations