diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc
index 404488c8c7..bdc3691239 100644
--- a/conformance/binary_json_conformance_suite.cc
+++ b/conformance/binary_json_conformance_suite.cc
@@ -1387,23 +1387,6 @@ void BinaryAndJsonConformanceSuite::RunSuiteImpl() {
       R"({"optionalNestedEnum": "FOO"})",
       "optional_nested_enum: FOO");
   // Enum fields with alias
-  RunValidJsonTest(
-      "EnumFieldWithAlias", REQUIRED,
-      R"({"optionalAliasedEnum": "ALIAS_BAZ"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  RunValidJsonTest(
-      "EnumFieldWithAliasUseAlias", REQUIRED,
-      R"({"optionalAliasedEnum": "QUX"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  RunValidJsonTest(
-      "EnumFieldWithAliasLowerCase", REQUIRED,
-      R"({"optionalAliasedEnum": "qux"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  RunValidJsonTest(
-      "EnumFieldWithAliasDifferentCase", REQUIRED,
-      R"({"optionalAliasedEnum": "bAz"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  // Enum fields with alias
   RunValidJsonTest(
       "EnumFieldWithAlias", REQUIRED,
       R"({"optionalAliasedEnum": "ALIAS_BAZ"})",
diff --git a/ruby/ext/google/protobuf_c/message.c b/ruby/ext/google/protobuf_c/message.c
index 81a782766f..edd14c2ffd 100644
--- a/ruby/ext/google/protobuf_c/message.c
+++ b/ruby/ext/google/protobuf_c/message.c
@@ -697,12 +697,12 @@ VALUE build_module_from_enumdesc(EnumDescriptor* enumdesc) {
        upb_enum_next(&it)) {
     const char* name = upb_enum_iter_name(&it);
     int32_t value = upb_enum_iter_number(&it);
-    if (name[0] < 'A' || name[0] > 'Z') {
-      rb_raise(cTypeError,
-               "Enum value '%s' does not start with an uppercase letter "
-               "as is required for Ruby constants.",
-               name);
-    }
+    // if (name[0] < 'A' || name[0] > 'Z') {
+    //   rb_raise(cTypeError,
+    //            "Enum value '%s' does not start with an uppercase letter "
+    //            "as is required for Ruby constants.",
+    //            name);
+    // }
     rb_define_const(mod, name, INT2NUM(value));
   }