diff --git a/src/google/protobuf/unittest_custom_features.proto b/src/google/protobuf/unittest_custom_features.proto
index 1d5307fbe2898..62a1118a8997d 100644
--- a/src/google/protobuf/unittest_custom_features.proto
+++ b/src/google/protobuf/unittest_custom_features.proto
@@ -50,6 +50,7 @@ enum ValueLifetimeFeature {
     edition_deprecated: EDITION_99998_TEST_ONLY
     deprecation_warning: "Custom feature deprecation warning"
     edition_removed: EDITION_99999_TEST_ONLY
+    removal_error: "Custom feature removal error"
   }];
   VALUE_LIFETIME_EMPTY_SUPPORT = 3 [feature_support = {}];
   VALUE_LIFETIME_FUTURE = 4
@@ -60,6 +61,7 @@ enum ValueLifetimeFeature {
   }];
   VALUE_LIFETIME_REMOVED = 6 [feature_support = {
     edition_deprecated: EDITION_2023
+    deprecation_warning: "Custom feature deprecation warning"
     edition_removed: EDITION_99997_TEST_ONLY
     removal_error: "Custom feature removal error"
   }];
@@ -202,6 +204,7 @@ message TestCustomFeatures {
     feature_support = {
       edition_introduced: EDITION_2023
       edition_removed: EDITION_2023
+      removal_error: "Custom feature removal error"
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "VALUE1" }
   ];
diff --git a/src/google/protobuf/unittest_features.proto b/src/google/protobuf/unittest_features.proto
index 7cdb11dcf6465..84a3c509b9b17 100644
--- a/src/google/protobuf/unittest_features.proto
+++ b/src/google/protobuf/unittest_features.proto
@@ -63,6 +63,7 @@ enum ValueLifetimeFeature {
     edition_deprecated: EDITION_99998_TEST_ONLY
     deprecation_warning: "Custom feature deprecation warning"
     edition_removed: EDITION_99999_TEST_ONLY
+    removal_error: "Custom feature removal error"
   }];
   VALUE_LIFETIME_EMPTY_SUPPORT = 3 [feature_support = {}];
   VALUE_LIFETIME_FUTURE = 4
@@ -73,6 +74,7 @@ enum ValueLifetimeFeature {
   }];
   VALUE_LIFETIME_REMOVED = 6 [feature_support = {
     edition_deprecated: EDITION_2023
+    deprecation_warning: "Custom feature deprecation warning"
     edition_removed: EDITION_99997_TEST_ONLY
     removal_error: "Custom feature removal error"
   }];
@@ -240,6 +242,7 @@ message TestFeatures {
     feature_support = {
       edition_introduced: EDITION_2023
       edition_removed: EDITION_2023
+      removal_error: "Custom feature removal error"
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "VALUE1" }
   ];