diff --git a/swift/account/auditor.py b/swift/account/auditor.py
index c8ca2b3417..2fbc1078a3 100644
--- a/swift/account/auditor.py
+++ b/swift/account/auditor.py
@@ -80,9 +80,9 @@ class AccountAuditor(Daemon):
         """Run the account audit until stopped."""
         reported = time.time()
         time.sleep(random() * self.interval)
-        all_brokers = self.broker_generator()
         while True:
             begin = time.time()
+            all_brokers = self.broker_generator()
             for broker in all_brokers:
                 self.account_audit(broker)
                 if time.time() - reported >= 3600:  # once an hour
@@ -97,8 +97,6 @@ class AccountAuditor(Daemon):
                 elapsed = time.time() - begin
                 if elapsed < self.interval:
                     time.sleep(self.interval - elapsed)
-            # reset all_brokers so we loop forever
-            all_brokers = self.broker_generator()
 
     def run_once(self):
         """Run the account audit once."""
diff --git a/swift/container/auditor.py b/swift/container/auditor.py
index 71411f4a39..dc7ffba97c 100644
--- a/swift/container/auditor.py
+++ b/swift/container/auditor.py
@@ -80,9 +80,9 @@ class ContainerAuditor(Daemon):
         """Run the container audit until stopped."""
         reported = time.time()
         time.sleep(random() * self.interval)
-        all_brokers = self.broker_generator()
         while True:
             begin = time.time()
+            all_brokers = self.broker_generator()
             for broker in all_brokers:
                 self.container_audit(broker)
                 if time.time() - reported >= 3600:  # once an hour
@@ -97,8 +97,6 @@ class ContainerAuditor(Daemon):
                 elapsed = time.time() - begin
                 if elapsed < self.interval:
                     time.sleep(self.interval - elapsed)
-            # reset all_brokers so we loop forever
-            all_brokers = self.broker_generator()
 
     def run_once(self):
         """Run the container audit once."""
diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py
index 9ae7477f37..e7735729a4 100644
--- a/swift/obj/auditor.py
+++ b/swift/obj/auditor.py
@@ -92,20 +92,21 @@ class ObjectAuditor(Daemon):
         time.sleep(random() * self.interval)
         while True:
             begin = time.time()
-            for df in self.DiskFile_generator():
+            all_dfs = self.DiskFile_generator()
+            for df in all_dfs:
                 self.object_audit(df)
-            if time.time() - reported >= 3600:  # once an hour
-                self.logger.info(
-                    'Since %s: Locally: %d passed audit, %d quarantined, %d '
-                    'errors' % (time.ctime(reported), self.passes,
-                                self.quarantines, self.errors))
-                reported = time.time()
-                self.passes = 0
-                self.quarantines = 0
-                self.errors = 0
-            elapsed = time.time() - begin
-            if elapsed < self.interval:
-                time.sleep(self.interval - elapsed)
+                if time.time() - reported >= 3600:  # once an hour
+                    self.logger.info(
+                        'Since %s: Locally: %d passed audit, %d quarantined, %d '
+                        'errors' % (time.ctime(reported), self.passes,
+                                    self.quarantines, self.errors))
+                    reported = time.time()
+                    self.passes = 0
+                    self.quarantines = 0
+                    self.errors = 0
+                elapsed = time.time() - begin
+                if elapsed < self.interval:
+                    time.sleep(self.interval - elapsed)
 
     def run_once(self):
         """Run the object audit once."""