diff --git a/cmd/entrypoints/serve_test.go b/cmd/entrypoints/serve_test.go
index edba678cf..bdd40d70d 100644
--- a/cmd/entrypoints/serve_test.go
+++ b/cmd/entrypoints/serve_test.go
@@ -9,13 +9,13 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/grpc/grpc-go/credentials/oauth"
 	"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
 	"github.com/lyft/flyteidl/gen/pb-go/flyteidl/service"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/oauth2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/oauth"
 )
 
 func TestClient(t *testing.T) {
diff --git a/go.mod b/go.mod
index 9f25c33f4..f78995e18 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,6 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway v1.12.1
-	github.com/grpc/grpc-go v1.26.0
 	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/jinzhu/gorm v1.9.12
 	github.com/json-iterator/go v1.1.9 // indirect
@@ -66,7 +65,6 @@ require (
 )
 
 replace (
-	github.com/grpc/grpc-go => google.golang.org/grpc v1.24.0
 	github.com/vektra/mockery => github.com/enghabu/mockery v0.0.0-20191009061720-9d0c8670c2f0
 	k8s.io/api => github.com/lyft/api v0.0.0-20191031200350-b49a72c274e0
 	k8s.io/apimachinery => github.com/lyft/apimachinery v0.0.0-20191031200210-047e3ea32d7f