diff --git a/python/pb_unit_tests/descriptor_test_wrapper.py b/python/pb_unit_tests/descriptor_test_wrapper.py
index 8f80275304..d34adfa2f8 100644
--- a/python/pb_unit_tests/descriptor_test_wrapper.py
+++ b/python/pb_unit_tests/descriptor_test_wrapper.py
@@ -41,43 +41,29 @@ descriptor_test.GeneratedDescriptorTest.testDescriptor.__unittest_expecting_fail
 descriptor_test.MakeDescriptorTest.testCamelcaseName.__unittest_expecting_failure__ = True
 descriptor_test.MakeDescriptorTest.testJsonName.__unittest_expecting_failure__ = True
 descriptor_test.MakeDescriptorTest.testMakeDescriptorWithOptions.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testAggregateOptions.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testComplexExtensionOptions.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testContainingServiceFixups.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testContainingTypeFixups.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testCustomOptionsCopyTo.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testDefault.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testDifferentCustomOptionTypes.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testEnumFixups.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testEnumValueName.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testFileDescriptor.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testFileDescriptorReferences.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testGetOptions.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testImmutableCppDescriptor.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testNestedOptions.__unittest_expecting_failure__ = True
+descriptor_test.NewDescriptorTest.testSimpleCustomOptions.__unittest_expecting_failure__ = True
 
 # We must skip these tests entirely (rather than running them with
 # __unittest_expecting_failure__) because they error out in setUp():
 #
-#  AttributeError: 'google.protobuf.pyext._message.DescriptorPool' object has no attribute 'Add'
+#  TypeError: Couldn't build proto file into descriptor pool: duplicate file name (some/filename/some.proto)
 #
-# TODO: change to __unittest_expecting_failure__ when DescriptorPool.Add() is implemented
-descriptor_test.DescriptorTest.testAggregateOptions.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testComplexExtensionOptions.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testContainingServiceFixups.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testContainingTypeFixups.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testCustomOptionsCopyTo.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testDefault.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testDifferentCustomOptionTypes.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testEnumFixups.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testEnumValueName.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testFileDescriptor.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testFileDescriptorReferences.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testGetOptions.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testImmutableCppDescriptor.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testNestedOptions.__unittest_skip__ = True
-descriptor_test.DescriptorTest.testSimpleCustomOptions.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testAggregateOptions.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testComplexExtensionOptions.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testContainingServiceFixups.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testContainingTypeFixups.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testCustomOptionsCopyTo.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testDefault.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testDifferentCustomOptionTypes.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testEnumFixups.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testEnumValueName.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testFileDescriptor.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testFileDescriptorReferences.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testGetOptions.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testImmutableCppDescriptor.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testNestedOptions.__unittest_skip__ = True
-descriptor_test.NewDescriptorTest.testSimpleCustomOptions.__unittest_skip__ = True
+# TODO: change to __unittest_expecting_failure__ when we have some solution for duplicated filenames
+descriptor_test.DescriptorTest.__unittest_skip__ = True
 
 if __name__ == '__main__':
   unittest.main(module=descriptor_test, verbosity=2)
diff --git a/python/pb_unit_tests/message_factory_test_wrapper.py b/python/pb_unit_tests/message_factory_test_wrapper.py
index 9b009b660b..ad39f1d8d0 100644
--- a/python/pb_unit_tests/message_factory_test_wrapper.py
+++ b/python/pb_unit_tests/message_factory_test_wrapper.py
@@ -26,16 +26,10 @@
 from google.protobuf.internal import message_factory_test
 import unittest
 
-# We must skip these tests entirely (rather than running them with
-# __unittest_expecting_failure__) because they error out in setUp():
-#
-#  AttributeError: 'google.protobuf.pyext._message.FileDescriptor' object has no attribute 'serialized_pb'
-#
-# TODO: change to __unittest_expecting_failure__ when serialized_pb is available.
-message_factory_test.MessageFactoryTest.testCreatePrototypeOverride.__unittest_skip__ = True
-message_factory_test.MessageFactoryTest.testDuplicateExtensionNumber.__unittest_skip__ = True
-message_factory_test.MessageFactoryTest.testGetMessages.__unittest_skip__ = True
-message_factory_test.MessageFactoryTest.testGetPrototype.__unittest_skip__ = True
+message_factory_test.MessageFactoryTest.testCreatePrototypeOverride.__unittest_expecting_failure__ = True
+message_factory_test.MessageFactoryTest.testDuplicateExtensionNumber.__unittest_expecting_failure__ = True
+message_factory_test.MessageFactoryTest.testGetMessages.__unittest_expecting_failure__ = True
+message_factory_test.MessageFactoryTest.testGetPrototype.__unittest_expecting_failure__ = True
 
 if __name__ == '__main__':
   unittest.main(module=message_factory_test, verbosity=2)
diff --git a/python/pb_unit_tests/message_test_wrapper.py b/python/pb_unit_tests/message_test_wrapper.py
index 7206af1c13..53781a9f6b 100644
--- a/python/pb_unit_tests/message_test_wrapper.py
+++ b/python/pb_unit_tests/message_test_wrapper.py
@@ -94,14 +94,8 @@ message_test.Proto3Test.testScalarMap.__unittest_expecting_failure__ = True
 message_test.Proto3Test.testScalarMapDefaults.__unittest_expecting_failure__ = True
 message_test.Proto3Test.testStringUnicodeConversionInMap.__unittest_expecting_failure__ = True
 message_test.Proto3Test.testSubmessageMap.__unittest_expecting_failure__ = True
-
-# We must skip these tests entirely (rather than running them with
-# __unittest_expecting_failure__) because they error out in setUpClass():
-#
-#  AttributeError: 'google.protobuf.pyext._message.DescriptorPool' object has no attribute 'Add'
-#
-# TODO: change to __unittest_expecting_failure__ when DescriptorPoo.Add is implemented
-message_test.OversizeProtosTest.__unittest_skip__ = True
+message_test.OversizeProtosTest.testAssertOversizeProto.__unittest_expecting_failure__ = True
+message_test.OversizeProtosTest.testSucceedOversizeProto.__unittest_expecting_failure__ = True
 
 if __name__ == '__main__':
   unittest.main(module=message_test, verbosity=2)
diff --git a/python/pb_unit_tests/text_format_test_wrapper.py b/python/pb_unit_tests/text_format_test_wrapper.py
index 42b929ea01..1f8f065ee3 100644
--- a/python/pb_unit_tests/text_format_test_wrapper.py
+++ b/python/pb_unit_tests/text_format_test_wrapper.py
@@ -99,13 +99,5 @@ getattr(text_format_test.TextFormatParserTests, "testParseEmptyText" + sep + "1"
 getattr(text_format_test.TextFormatParserTests, "testParseEmptyText" + sep + "0").__unittest_expecting_failure__ = True
 getattr(text_format_test.TextFormatParserTests, "testParseEmptyText" + sep + "1").__unittest_expecting_failure__ = True
 
-# We must skip these tests entirely (rather than running them with
-# __unittest_expecting_failure__) because they error out in setUp():
-#
-#  NotImplementedError: Conversion of message types not yet implemented
-#
-# TODO: change to __unittest_expecting_failure__ when message types can be converted
-#text_format_test.WhitespaceTest.__unittest_skip__ = True
-
 if __name__ == '__main__':
   unittest.main(module=text_format_test, verbosity=2)
diff --git a/python/pb_unit_tests/unknown_fields_test_wrapper.py b/python/pb_unit_tests/unknown_fields_test_wrapper.py
index 368c06012d..f87e3f8994 100644
--- a/python/pb_unit_tests/unknown_fields_test_wrapper.py
+++ b/python/pb_unit_tests/unknown_fields_test_wrapper.py
@@ -26,12 +26,6 @@
 from google.protobuf.internal import unknown_fields_test
 import unittest
 
-# We must skip these tests entirely (rather than running them with
-# __unittest_expecting_failure__) because they error out in setUp():
-#
-#  NotImplementedError: access repeated
-#
-# TODO: change to __unittest_expecting_failure__ when repeated fields are available
 unknown_fields_test.UnknownEnumValuesTest.testCheckUnknownFieldValueForEnum.__unittest_expecting_failure__ = True
 unknown_fields_test.UnknownEnumValuesTest.testRoundTrip.__unittest_expecting_failure__ = True
 unknown_fields_test.UnknownFieldsAccessorsTest.testCheckUnknownFieldValue.__unittest_expecting_failure__ = True