diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0d6b5b45b..8ab38a89b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,6 +105,16 @@ jobs:
           https://github.com/go-redis/redis
           contrib/go-redis/redis/vendor/github.com/go-redis/redis
 
+    - run:
+        name: Vendor github.com/googleapis/gnostic for k8s.io/client-go
+        # This step checks out k8s.io/client-go and vendors 
+        # github.com/googleapis/gnostic to fix a breaking change made in
+        # gnostic. See kubernetes/client-go#741
+        # TODO(knusbaum): remove this once the breaking change is resolved or propagated
+        command: |
+          git clone https://github.com/kubernetes/client-go $GOPATH/src/k8s.io/client-go
+          git clone --branch v0.4.0 https://github.com/googleapis/gnostic $GOPATH/src/k8s.io/client-go/vendor/github.com/googleapis/gnostic
+
     - run:
         name: Fetching dependencies
         command: |