diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d8f987823..5d0f7a207b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,7 +91,6 @@ jobs:
         command: |
           go get k8s.io/client-go@v0.17.0
           go get k8s.io/apimachinery@v0.17.0
-          go get google.golang.org/grpc@v1.2.0
           go get github.com/zenazn/goji@64eb341 # tag "v1.0"
 
     - restore_cache:
@@ -100,7 +99,6 @@ jobs:
     - run:
         name: Fetching dependencies
         command: |
-          go mod tidy
           go get -v -u golang.org/x/lint/golint
           curl https://git.io/vp6lP | sh # https://github.com/alecthomas/gometalinter#binary-releases
 
@@ -109,14 +107,6 @@ jobs:
         paths:
           - /go/pkg/mod
 
-    - run:
-        name: Vendor klog v0.4.0
-        # Temporary, until kubernetes/client-go#656 gets resolved.
-        command: >
-          git clone --branch v0.4.0
-          https://github.com/kubernetes/klog
-          $GOPATH/src/k8s.io/client-go/vendor/k8s.io/klog
-
     - run:
         name: Wait for MySQL
         command: dockerize -wait tcp://localhost:3306 -timeout 1m
@@ -164,5 +154,6 @@ jobs:
     - run:
         name: Testing
         command: |
-              INTEGRATION=1 go test -race `go list ./...` # | grep -v grpc.v12`
-              #go test ./contrib/google.golang.org/grpc.v12/...
+              INTEGRATION=1 go test -race `go list ./... | grep -v grpc.v12`
+              go get google.golang.org/grpc@v1.2.0
+              go test ./contrib/google.golang.org/grpc.v12/...
diff --git a/go.sum b/go.sum
index 3e3e07e7af..c24fffe542 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,6 @@
 cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.35.0/go.mod h1:UE4juzxiHpKLbqrOrwVrKuaZvUtLA9CSnaYO+y53jxA=
 cloud.google.com/go v0.35.1/go.mod h1:wfjPZNvXCBYESy3fIynybskMP48KVPrjSPCnXiK7Prg=
@@ -917,6 +918,7 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=