diff --git a/.travis.yml b/.travis.yml
index efae50b5927248bcc137a3b03b008c9fbd33831f..c5d28cd44b78594fffc76a6a20c3ffe13414eb76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ sudo: required
 go:
   - 1.8
   - 1.9
+  - '1.10'
 
 go_import_path: github.com/coreos/dex
 
diff --git a/Dockerfile b/Dockerfile
index 8da687b5ac3e6a4ed488de2d587e3b1fc6c056e1..f0689b150315dd3e7c8463284d2011d84a855f36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2-alpine
+FROM golang:1.10.0-alpine
 
 RUN apk add --no-cache --update alpine-sdk