diff --git a/python/google/protobuf/internal/json_format_test.py b/python/google/protobuf/internal/json_format_test.py
index d018c3f2e69ce..e5d0e8435cb4f 100644
--- a/python/google/protobuf/internal/json_format_test.py
+++ b/python/google/protobuf/internal/json_format_test.py
@@ -1281,5 +1281,17 @@ def testNestedRecursiveLimit(self):
     json_format.Parse('{"payload": {}, "child": {"child":{}}}',
                       message, max_recursion_depth=3)
 
+  def testIncludingDefaultValues(self):
+    message = json_format_proto3_pb2.TestMessage()
+    js_dict = json_format.MessageToDict(message, including_default_value_fields=True)
+    self.assertFalse("messageValue" in js_dict)
+    self.assertTrue("int32Value" in js_dict)
+
+  def testIncludingDefaultValuesWrapper(self):
+    message = json_format_proto3_pb2.TestWrapper()
+    js_dict = json_format.MessageToDict(message, including_default_value_fields=True)
+    self.assertFalse("stringValue" in js_dict)
+    self.assertTrue("repeatedStringValue" in js_dict)
+
 if __name__ == '__main__':
   unittest.main()