1 files changed, 8 insertions, 5 deletions
diff --git a/UnitTesting/GTMNSObject+UnitTesting.m b/UnitTesting/GTMNSObject+UnitTesting.m
index bc94729..f3bfbb1 100644
--- a/UnitTesting/GTMNSObject+UnitTesting.m
+++ b/UnitTesting/GTMNSObject+UnitTesting.m
@@ -417,11 +417,14 @@ static NSString *gGTMUnitTestSaveToDirectory = nil;
   // we're on an automated build system, so use the build products dir as an
   // override instead of writing on the desktop.
   NSDictionary *env = [[NSProcessInfo processInfo] environment];
-  NSEnumerator *enumerator = [env keyEnumerator];
-  NSString *key = nil;
-  while (((key = [enumerator nextObject]) != nil) &&
-         ![key hasSuffix:@"BUILD_NUMBER"])
-    ;
+  BOOL foundBuildNumber = NO;
+  NSString *key;
+  GTM_FOREACH_KEY(key, env) {
+    if ([key hasSuffix:@"BUILD_NUMBER"]) {
+      foundBuildNumber = YES;
+      break;
+    }
+  }
   if (key) {
     result = [env objectForKey:@"BUILT_PRODUCTS_DIR"];
   }