diff --git a/.appveyor.yml b/.appveyor.yml
index 10babf806..31292a749 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,9 @@ branches:
 environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
-  GO_VERSION: 1.9
+  matrix:
+    - GO_VERSION: 1.9
+    - GO_VERSION: 1.10
 
 before_build:
   - choco install -y mingw
diff --git a/.travis.yml b/.travis.yml
index 3310250e2..cf8005d7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ services:
 language: go
 
 go:
-  - 1.9.x
+  - "1.9.x"
+  - "1.10"
 
 go_import_path: github.com/containerd/containerd
 
@@ -56,7 +57,7 @@ script:
   - script/validate/vendor
   - go build -i .
   - make check
-  - if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi
+  - if [[ "$GOOS" = "linux" && "$TRAVIS_GO_VERSION" != "1.9"* ]]; then make check-protos check-api-descriptors; fi
   - make build
   - make binaries
   - if [ "$GOOS" = "linux" ]; then sudo make install ; fi
diff --git a/api/events/container.pb.go b/api/events/container.pb.go
index b05a402bb..5b715fc1e 100644
--- a/api/events/container.pb.go
+++ b/api/events/container.pb.go
@@ -158,9 +158,7 @@ func (m *ContainerCreate_Runtime) Field(fieldpath []string) (string, bool) {
 			return "", false
 		}
 
-		adaptor, ok := decoded.(interface {
-			Field([]string) (string, bool)
-		})
+		adaptor, ok := decoded.(interface{ Field([]string) (string, bool) })
 		if !ok {
 			return "", false
 		}
diff --git a/api/services/events/v1/events.pb.go b/api/services/events/v1/events.pb.go
index e2ad455a4..52cca0acd 100644
--- a/api/services/events/v1/events.pb.go
+++ b/api/services/events/v1/events.pb.go
@@ -115,9 +115,7 @@ func (m *Envelope) Field(fieldpath []string) (string, bool) {
 			return "", false
 		}
 
-		adaptor, ok := decoded.(interface {
-			Field([]string) (string, bool)
-		})
+		adaptor, ok := decoded.(interface{ Field([]string) (string, bool) })
 		if !ok {
 			return "", false
 		}