diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc
index 96012a10b0..7c982f9312 100644
--- a/conformance/binary_json_conformance_suite.cc
+++ b/conformance/binary_json_conformance_suite.cc
@@ -804,11 +804,16 @@ void BinaryAndJsonConformanceSuite::RunSuiteImpl() {
     {delim("\xfb"), "\"\xfb\""},
     {delim(""), "\"\""},
   });
+  TestValidDataForType(FieldDescriptor::TYPE_ENUM, {
+    {varint(0), "FOO"},
+    {varint(1), "BAR"},
+    {varint(2), "BAZ"},
+    {varint(-1), "NEG"},
+  });
 
   // TODO(haberman):
   // TestValidDataForType(FieldDescriptor::TYPE_GROUP
   // TestValidDataForType(FieldDescriptor::TYPE_MESSAGE
-  // TestValidDataForType(FieldDescriptor::TYPE_ENUM
 
   RunValidJsonTest("HelloWorld", REQUIRED,
                    "{\"optionalString\":\"Hello, World!\"}",
diff --git a/conformance/failure_list_js.txt b/conformance/failure_list_js.txt
index f8f6a578fa..df70a9b02e 100644
--- a/conformance/failure_list_js.txt
+++ b/conformance/failure_list_js.txt
@@ -11,3 +11,4 @@ Required.Proto3.ProtobufInput.ValidDataRepeated.SINT32.ProtobufOutput
 Required.Proto3.ProtobufInput.ValidDataRepeated.SINT64.ProtobufOutput
 Required.Proto3.ProtobufInput.ValidDataRepeated.UINT32.ProtobufOutput
 Required.Proto3.ProtobufInput.ValidDataRepeated.UINT64.ProtobufOutput
+Required.Proto3.ProtobufInput.ValidDataRepeated.ENUM.ProtobufOutput