diff --git a/objectivec/Tests/GPBDescriptorTests.m b/objectivec/Tests/GPBDescriptorTests.m
index 6fa7202bc46f..bdcc2e893c57 100644
--- a/objectivec/Tests/GPBDescriptorTests.m
+++ b/objectivec/Tests/GPBDescriptorTests.m
@@ -305,7 +305,7 @@ - (void)testOneofDescriptor {
   GPBDescriptor *descriptor = [TestOneof2 descriptor];
 
   // All fields should be listed.
-  XCTAssertEqual(descriptor.fields.count, 17U);
+  XCTAssertEqual(descriptor.fields.count, 21U);
 
   // There are two oneofs in there.
   XCTAssertEqual(descriptor.oneofs.count, 2U);
@@ -330,7 +330,7 @@ - (void)testOneofDescriptor {
 
   GPBOneofDescriptor *oneofBar = [descriptor oneofWithName:@"bar"];
   XCTAssertNotNil(oneofBar);
-  XCTAssertEqual(oneofBar.fields.count, 6U);
+  XCTAssertEqual(oneofBar.fields.count, 10U);
 
   // Pointer comparisons.
   XCTAssertEqual([oneofBar fieldWithNumber:TestOneof2_FieldNumber_BarString],