1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/unittest_custom_options.proto b/src/google/protobuf/unittest_custom_options.proto
index 157b10a0..88f6f1f7 100644
--- a/src/google/protobuf/unittest_custom_options.proto
+++ b/src/google/protobuf/unittest_custom_options.proto
@@ -66,7 +66,9 @@ extend google.protobuf.EnumOptions {
   optional sfixed32 enum_opt1 = 7753576;
 }
 
-// TODO(benjy): Test options on enum values when the parser supports them.
+extend google.protobuf.EnumValueOptions {
+  optional int32 enum_value_opt1 = 1560678;
+}
 
 extend google.protobuf.ServiceOptions {
   optional sint64 service_opt1 = 7887650;
@@ -95,7 +97,7 @@ message TestMessageWithCustomOptions {
     option (enum_opt1) = -789;
 
     ANENUM_VAL1 = 1;
-    ANENUM_VAL2 = 2;
+    ANENUM_VAL2 = 2 [(enum_value_opt1) = 123];
   }
 }