diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto
index 36c03ee1055..7c620db9dc0 100644
--- a/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto
+++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 
 // Coprocessor test
 option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto
index e7b301de2d4..636337d37fa 100644
--- a/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto
+++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 
 // Coprocessor test
 option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto
index 04f07413736..4e869ceccbc 100644
--- a/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto
+++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 
 // Coprocessor test
 option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
diff --git a/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto b/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto
index 64dce671057..f3944e961e9 100644
--- a/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto
+++ b/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 
 option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
 option java_outer_classname = "IncrementCounterProcessorTestProtos";
diff --git a/hbase-endpoint/src/main/protobuf/ShellExecEndpoint.proto b/hbase-endpoint/src/main/protobuf/ShellExecEndpoint.proto
index 96c72da13c0..fdc890e082a 100644
--- a/hbase-endpoint/src/main/protobuf/ShellExecEndpoint.proto
+++ b/hbase-endpoint/src/main/protobuf/ShellExecEndpoint.proto
@@ -21,6 +21,7 @@
  */
 
 syntax = "proto2";
+package hbase.test.pb;
 option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
 option java_outer_classname = "ShellExecEndpoint";
 option java_generic_services = true;
diff --git a/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto
index e927e4b8019..5f031ade3db 100644
--- a/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 option java_package = "org.apache.hadoop.hbase.shaded.ipc.protobuf.generated";
 option java_outer_classname = "TestProcedureProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol-shaded/src/main/protobuf/test.proto b/hbase-protocol-shaded/src/main/protobuf/test.proto
index 5101644138d..7b342ea1027 100644
--- a/hbase-protocol-shaded/src/main/protobuf/test.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/test.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 
 option java_package = "org.apache.hadoop.hbase.shaded.ipc.protobuf.generated";
 option java_outer_classname = "TestProtos";
diff --git a/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto b/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto
index 03ac3852515..e785d1695e9 100644
--- a/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 syntax = "proto2";
+package hbase.test.pb;
 option java_package = "org.apache.hadoop.hbase.shaded.ipc.protobuf.generated";
 option java_outer_classname = "TestRpcServiceProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/PingProtocol.proto b/hbase-protocol/src/main/protobuf/PingProtocol.proto
index 9a645994886..3272198196e 100644
--- a/hbase-protocol/src/main/protobuf/PingProtocol.proto
+++ b/hbase-protocol/src/main/protobuf/PingProtocol.proto
@@ -17,6 +17,7 @@
  */
 syntax = "proto2";
 
+package hbase.test.pb;
 // Coprocessor test
 option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
 option java_outer_classname = "PingProtos";