diff --git a/.travis.yml b/.travis.yml
index 24225ea4..21ffcfef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ sudo: false
 language: go
 
 go:
-- 1.5.4
-- 1.6.2
+- 1.8.x
 
 script:
 - make
diff --git a/circle.yml b/circle.yml
index b138f815..a56e386d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     DOCKER_IMAGE_NAME: prom/pushgateway
     QUAY_IMAGE_NAME: quay.io/prometheus/pushgateway
-    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6-base
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.8-base
     REPO_PATH: github.com/prometheus/pushgateway
   pre:
     - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'