diff --git a/transport/grpc/_grpc_test/client.go b/transport/grpc/_grpc_test/client.go
index a70ebc2..1e0c8a7 100644
--- a/transport/grpc/_grpc_test/client.go
+++ b/transport/grpc/_grpc_test/client.go
@@ -7,7 +7,7 @@
 
 	"github.com/go-kit/kit/endpoint"
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	pb "github.com/go-kit/kit/transport/grpc/_pb"
+	"github.com/go-kit/kit/transport/grpc/_grpc_test/pb"
 )
 
 type clientBinding struct {
diff --git a/transport/grpc/_grpc_test/pb/generate.go b/transport/grpc/_grpc_test/pb/generate.go
new file mode 100644
index 0000000..aa20bb6
--- /dev/null
+++ b/transport/grpc/_grpc_test/pb/generate.go
@@ -0,0 +1,3 @@
+package pb
+
+//go:generate protoc test.proto --go_out=plugins=grpc:.
diff --git a/transport/grpc/_grpc_test/pb/test.pb.go b/transport/grpc/_grpc_test/pb/test.pb.go
new file mode 100644
index 0000000..97d29bb
--- /dev/null
+++ b/transport/grpc/_grpc_test/pb/test.pb.go
@@ -0,0 +1,167 @@
+// Code generated by protoc-gen-go.
+// source: test.proto
+// DO NOT EDIT!
+
+/*
+Package pb is a generated protocol buffer package.
+
+It is generated from these files:
+	test.proto
+
+It has these top-level messages:
+	TestRequest
+	TestResponse
+*/
+package pb
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type TestRequest struct {
+	A string `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"`
+	B int64  `protobuf:"varint,2,opt,name=b" json:"b,omitempty"`
+}
+
+func (m *TestRequest) Reset()                    { *m = TestRequest{} }
+func (m *TestRequest) String() string            { return proto.CompactTextString(m) }
+func (*TestRequest) ProtoMessage()               {}
+func (*TestRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *TestRequest) GetA() string {
+	if m != nil {
+		return m.A
+	}
+	return ""
+}
+
+func (m *TestRequest) GetB() int64 {
+	if m != nil {
+		return m.B
+	}
+	return 0
+}
+
+type TestResponse struct {
+	V string `protobuf:"bytes,1,opt,name=v" json:"v,omitempty"`
+}
+
+func (m *TestResponse) Reset()                    { *m = TestResponse{} }
+func (m *TestResponse) String() string            { return proto.CompactTextString(m) }
+func (*TestResponse) ProtoMessage()               {}
+func (*TestResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *TestResponse) GetV() string {
+	if m != nil {
+		return m.V
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*TestRequest)(nil), "pb.TestRequest")
+	proto.RegisterType((*TestResponse)(nil), "pb.TestResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for Test service
+
+type TestClient interface {
+	Test(ctx context.Context, in *TestRequest, opts ...grpc.CallOption) (*TestResponse, error)
+}
+
+type testClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewTestClient(cc *grpc.ClientConn) TestClient {
+	return &testClient{cc}
+}
+
+func (c *testClient) Test(ctx context.Context, in *TestRequest, opts ...grpc.CallOption) (*TestResponse, error) {
+	out := new(TestResponse)
+	err := grpc.Invoke(ctx, "/pb.Test/Test", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for Test service
+
+type TestServer interface {
+	Test(context.Context, *TestRequest) (*TestResponse, error)
+}
+
+func RegisterTestServer(s *grpc.Server, srv TestServer) {
+	s.RegisterService(&_Test_serviceDesc, srv)
+}
+
+func _Test_Test_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TestRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TestServer).Test(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/pb.Test/Test",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TestServer).Test(ctx, req.(*TestRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Test_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "pb.Test",
+	HandlerType: (*TestServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Test",
+			Handler:    _Test_Test_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "test.proto",
+}
+
+func init() { proto.RegisterFile("test.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 129 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0x49, 0x2d, 0x2e,
+	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xd2, 0xe4, 0xe2, 0x0e, 0x49,
+	0x2d, 0x2e, 0x09, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0xe2, 0xe1, 0x62, 0x4c, 0x94, 0x60,
+	0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x62, 0x4c, 0x04, 0xf1, 0x92, 0x24, 0x98, 0x14, 0x18, 0x35, 0x98,
+	0x83, 0x18, 0x93, 0x94, 0x64, 0xb8, 0x78, 0x20, 0x4a, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x41,
+	0xb2, 0x65, 0x30, 0xb5, 0x65, 0x46, 0xc6, 0x5c, 0x2c, 0x20, 0x59, 0x21, 0x6d, 0x28, 0xcd, 0xaf,
+	0x57, 0x90, 0xa4, 0x87, 0x64, 0xb4, 0x94, 0x00, 0x42, 0x00, 0x62, 0x80, 0x12, 0x43, 0x12, 0x1b,
+	0xd8, 0x21, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xfc, 0xd8, 0xf1, 0x96, 0x00, 0x00,
+	0x00,
+}
diff --git a/transport/grpc/_grpc_test/pb/test.proto b/transport/grpc/_grpc_test/pb/test.proto
new file mode 100644
index 0000000..6a3555e
--- /dev/null
+++ b/transport/grpc/_grpc_test/pb/test.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package pb;
+
+service Test {
+  rpc Test (TestRequest) returns (TestResponse) {}
+}
+
+message TestRequest {
+  string a = 1;
+  int64 b = 2;
+}
+
+message TestResponse {
+  string v = 1;
+}
diff --git a/transport/grpc/_grpc_test/request_response.go b/transport/grpc/_grpc_test/request_response.go
index 13c2cb1..269703d 100644
--- a/transport/grpc/_grpc_test/request_response.go
+++ b/transport/grpc/_grpc_test/request_response.go
@@ -3,7 +3,7 @@
 import (
 	"context"
 
-	pb "github.com/go-kit/kit/transport/grpc/_pb"
+	"github.com/go-kit/kit/transport/grpc/_grpc_test/pb"
 )
 
 func encodeRequest(ctx context.Context, req interface{}) (interface{}, error) {
diff --git a/transport/grpc/_grpc_test/server.go b/transport/grpc/_grpc_test/server.go
index 52e9048..49e70a9 100644
--- a/transport/grpc/_grpc_test/server.go
+++ b/transport/grpc/_grpc_test/server.go
@@ -8,7 +8,7 @@
 
 	"github.com/go-kit/kit/endpoint"
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	pb "github.com/go-kit/kit/transport/grpc/_pb"
+	"github.com/go-kit/kit/transport/grpc/_grpc_test/pb"
 )
 
 type service struct{}
diff --git a/transport/grpc/_pb/generate.go b/transport/grpc/_pb/generate.go
deleted file mode 100644
index aa20bb6..0000000
--- a/transport/grpc/_pb/generate.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package pb
-
-//go:generate protoc test.proto --go_out=plugins=grpc:.
diff --git a/transport/grpc/_pb/test.pb.go b/transport/grpc/_pb/test.pb.go
deleted file mode 100644
index 97d29bb..0000000
--- a/transport/grpc/_pb/test.pb.go
+++ /dev/null
@@ -1,167 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: test.proto
-// DO NOT EDIT!
-
-/*
-Package pb is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	TestRequest
-	TestResponse
-*/
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type TestRequest struct {
-	A string `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"`
-	B int64  `protobuf:"varint,2,opt,name=b" json:"b,omitempty"`
-}
-
-func (m *TestRequest) Reset()                    { *m = TestRequest{} }
-func (m *TestRequest) String() string            { return proto.CompactTextString(m) }
-func (*TestRequest) ProtoMessage()               {}
-func (*TestRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *TestRequest) GetA() string {
-	if m != nil {
-		return m.A
-	}
-	return ""
-}
-
-func (m *TestRequest) GetB() int64 {
-	if m != nil {
-		return m.B
-	}
-	return 0
-}
-
-type TestResponse struct {
-	V string `protobuf:"bytes,1,opt,name=v" json:"v,omitempty"`
-}
-
-func (m *TestResponse) Reset()                    { *m = TestResponse{} }
-func (m *TestResponse) String() string            { return proto.CompactTextString(m) }
-func (*TestResponse) ProtoMessage()               {}
-func (*TestResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *TestResponse) GetV() string {
-	if m != nil {
-		return m.V
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*TestRequest)(nil), "pb.TestRequest")
-	proto.RegisterType((*TestResponse)(nil), "pb.TestResponse")
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for Test service
-
-type TestClient interface {
-	Test(ctx context.Context, in *TestRequest, opts ...grpc.CallOption) (*TestResponse, error)
-}
-
-type testClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewTestClient(cc *grpc.ClientConn) TestClient {
-	return &testClient{cc}
-}
-
-func (c *testClient) Test(ctx context.Context, in *TestRequest, opts ...grpc.CallOption) (*TestResponse, error) {
-	out := new(TestResponse)
-	err := grpc.Invoke(ctx, "/pb.Test/Test", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for Test service
-
-type TestServer interface {
-	Test(context.Context, *TestRequest) (*TestResponse, error)
-}
-
-func RegisterTestServer(s *grpc.Server, srv TestServer) {
-	s.RegisterService(&_Test_serviceDesc, srv)
-}
-
-func _Test_Test_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TestRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TestServer).Test(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.Test/Test",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TestServer).Test(ctx, req.(*TestRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _Test_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pb.Test",
-	HandlerType: (*TestServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Test",
-			Handler:    _Test_Test_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "test.proto",
-}
-
-func init() { proto.RegisterFile("test.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 129 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0x49, 0x2d, 0x2e,
-	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xd2, 0xe4, 0xe2, 0x0e, 0x49,
-	0x2d, 0x2e, 0x09, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0xe2, 0xe1, 0x62, 0x4c, 0x94, 0x60,
-	0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x62, 0x4c, 0x04, 0xf1, 0x92, 0x24, 0x98, 0x14, 0x18, 0x35, 0x98,
-	0x83, 0x18, 0x93, 0x94, 0x64, 0xb8, 0x78, 0x20, 0x4a, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x41,
-	0xb2, 0x65, 0x30, 0xb5, 0x65, 0x46, 0xc6, 0x5c, 0x2c, 0x20, 0x59, 0x21, 0x6d, 0x28, 0xcd, 0xaf,
-	0x57, 0x90, 0xa4, 0x87, 0x64, 0xb4, 0x94, 0x00, 0x42, 0x00, 0x62, 0x80, 0x12, 0x43, 0x12, 0x1b,
-	0xd8, 0x21, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xfc, 0xd8, 0xf1, 0x96, 0x00, 0x00,
-	0x00,
-}
diff --git a/transport/grpc/_pb/test.proto b/transport/grpc/_pb/test.proto
deleted file mode 100644
index 6a3555e..0000000
--- a/transport/grpc/_pb/test.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-package pb;
-
-service Test {
-  rpc Test (TestRequest) returns (TestResponse) {}
-}
-
-message TestRequest {
-  string a = 1;
-  int64 b = 2;
-}
-
-message TestResponse {
-  string v = 1;
-}
diff --git a/transport/grpc/client_test.go b/transport/grpc/client_test.go
index bbd2f5e..e4cac1d 100644
--- a/transport/grpc/client_test.go
+++ b/transport/grpc/client_test.go
@@ -9,7 +9,7 @@
 	"google.golang.org/grpc"
 
 	test "github.com/go-kit/kit/transport/grpc/_grpc_test"
-	pb "github.com/go-kit/kit/transport/grpc/_pb"
+	"github.com/go-kit/kit/transport/grpc/_grpc_test/pb"
 )
 
 const (