diff --git a/GoogleDataTransport/GDTCORTests/Unit/GDTCORFlatFileStorageTest.m b/GoogleDataTransport/GDTCORTests/Unit/GDTCORFlatFileStorageTest.m
index b98716a0102..6fa385e1f2c 100644
--- a/GoogleDataTransport/GDTCORTests/Unit/GDTCORFlatFileStorageTest.m
+++ b/GoogleDataTransport/GDTCORTests/Unit/GDTCORFlatFileStorageTest.m
@@ -1170,7 +1170,7 @@ - (void)testStoreEvent_WhenSizeLimitReached_ThenNewEventIsSkipped {
                   onComplete:^{
                     [removeBatchExpectation fulfill];
                   }];
-  [self waitForExpectations:@[ removeBatchExpectation ] timeout:5];
+  [self waitForExpectations:@[ removeBatchExpectation ] timeout:generatedEvents.count * 0.1];
 
   // 6. Try to add another event.
   XCTestExpectation *storeExpectation2 = [self expectationWithDescription:@"storeExpectation2"];