diff --git a/conformance/conformance.proto b/conformance/conformance.proto
index a3bbc1a..c4aed80 100644
--- a/conformance/conformance.proto
+++ b/conformance/conformance.proto
@@ -35,8 +35,8 @@
   UNSPECIFIED = 0;
   PROTOBUF = 1;
   JSON = 2;
+  JSPB = 3;  // Only used inside Google. Opensource testees just skip it.
   TEXT_FORMAT = 4;
-  reserved 3;
 }
 
 enum TestCategory {
@@ -49,10 +49,12 @@
   // https://developers.google.com/protocol-buffers/docs/proto3#json_options
   // for more detail.
   JSON_IGNORE_UNKNOWN_PARSING_TEST = 3;
+  // Test jspb wire format. Only used inside Google. Opensource testees just
+  // skip it.
+  JSPB_TEST = 4;
   // Test text format. For cpp, java and python, testees can already deal with
   // this type. Testees of other languages can simply skip it.
   TEXT_FORMAT_TEST = 5;
-  reserved 4;
 }
 
 // The conformance runner will request a list of failures as the first request.
@@ -74,6 +76,8 @@
   oneof payload {
     bytes protobuf_payload = 1;
     string json_payload = 2;
+    // Only used inside Google.  Opensource testees just skip it.
+    string jspb_payload = 7;
     string text_payload = 8;
   }
 
@@ -90,11 +94,12 @@
   // TestCategory for more information.
   TestCategory test_category = 5;
 
+  // Specify details for how to encode jspb.
+  JspbEncodingConfig jspb_encoding_options = 6;
+
   // This can be used in json and text format. If true, testee should print
   // unknown fields instead of ignore. This feature is optional.
   bool print_unknown_fields = 9;
-
-  reserved 6, 7;
 }
 
 // Represents a single test case's output.
@@ -134,10 +139,19 @@
     // wasn't supported, like JSON input/output.
     string skipped = 5;
 
+    // If the input was successfully parsed and the requested output was JSPB,
+    // serialize to JSPB and set it in this field. JSPB is only used inside
+    // Google. Opensource testees can just skip it.
+    string jspb_payload = 7;
+
     // If the input was successfully parsed and the requested output was
     // TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
     string text_payload = 8;
   }
+}
 
-  reserved 7;
+// Encoding options for jspb format.
+message JspbEncodingConfig {
+  // Encode the value field of Any as jspb array if true, otherwise binary.
+  bool use_jspb_array_any_format = 1;
 }