diff --git a/pubsub/example_test.go b/pubsub/example_test.go
index 0943af7467..5259dcf985 100644
--- a/pubsub/example_test.go
+++ b/pubsub/example_test.go
@@ -22,7 +22,7 @@ import (
 	"gocloud.dev/pubsub"
 
 	pbraw "cloud.google.com/go/pubsub/apiv1"
-	pbapi "google.golang.org/genproto/googleapis/pubsub/v1"
+	pbapi "cloud.google.com/go/pubsub/apiv1/pubsubpb"
 	"google.golang.org/grpc/status"
 )
 
diff --git a/pubsub/gcppubsub/gcppubsub.go b/pubsub/gcppubsub/gcppubsub.go
index a75d5d3f67..9fda85c3fd 100644
--- a/pubsub/gcppubsub/gcppubsub.go
+++ b/pubsub/gcppubsub/gcppubsub.go
@@ -62,6 +62,7 @@ import (
 	"time"
 
 	raw "cloud.google.com/go/pubsub/apiv1"
+	pb "cloud.google.com/go/pubsub/apiv1/pubsubpb"
 	"github.com/google/wire"
 	"gocloud.dev/gcerrors"
 	"gocloud.dev/gcp"
@@ -71,7 +72,6 @@ import (
 	"gocloud.dev/pubsub/batcher"
 	"gocloud.dev/pubsub/driver"
 	"google.golang.org/api/option"
-	pb "google.golang.org/genproto/googleapis/pubsub/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/oauth"
diff --git a/pubsub/gcppubsub/gcppubsub_test.go b/pubsub/gcppubsub/gcppubsub_test.go
index 2d2677668d..e52d2659e7 100644
--- a/pubsub/gcppubsub/gcppubsub_test.go
+++ b/pubsub/gcppubsub/gcppubsub_test.go
@@ -23,12 +23,12 @@ import (
 	"testing"
 
 	raw "cloud.google.com/go/pubsub/apiv1"
+	"cloud.google.com/go/pubsub/apiv1/pubsubpb"
 	"gocloud.dev/gcp"
 	"gocloud.dev/internal/testing/setup"
 	"gocloud.dev/pubsub"
 	"gocloud.dev/pubsub/driver"
 	"gocloud.dev/pubsub/drivertest"
-	pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )