diff --git a/.circleci/config.yml b/.circleci/config.yml
index 64cc01b..ee7ee51 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,10 +12,20 @@ jobs:
       - run: make build
       - run: make test
       - run: make lint
-  test-1.10beta2:
+  test-1.10:
     working_directory: /go/src/go.universe.tf/netboot
     docker:
-      - image: circleci/golang:1.10beta2
+      - image: circleci/golang:1.10
+    steps:
+      - checkout
+      - run: make ci-prepare
+      - run: make build
+      - run: make test
+      - run: make lint
+  test-1.11beta2:
+    working_directory: /go/src/go.universe.tf/netboot
+    docker:
+      - image: circleci/golang:1.11beta2
     steps:
       - checkout
       - run: make ci-prepare
@@ -41,7 +51,11 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - test-1.10beta2:
+      - test-1.10:
+          filters:
+            tags:
+              only: /.*/
+      - test-1.11beta2:
           filters:
             tags:
               only: /.*/
diff --git a/.circleci/gen-config.go b/.circleci/gen-config.go
index 26a2c97..d6310c1 100644
--- a/.circleci/gen-config.go
+++ b/.circleci/gen-config.go
@@ -10,7 +10,7 @@ import (
 func main() {
 	tmpl := template.Must(template.ParseFiles("config.yml.tmpl"))
 	v := map[string][]string{
-		"GoVersions": []string{"1.9", "1.10beta2"},
+		"GoVersions": []string{"1.9", "1.10", "1.11beta2"},
 		"Arch":       []string{"amd64", "arm", "arm64", "ppc64le", "s390x"},
 	}
 	if err := tmpl.Execute(os.Stdout, v); err != nil {