3 files changed, 3 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 406e7e003..cc9b03b80 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -717,7 +717,7 @@ Bcfg2 client itself.""")
     def run(self, args):  # pylint: disable=W0221
         try:
             self.load_plugins()
-            self.fam.handle_events_in_interval(1)
+            self.block_for_fam_events(handle_events=True)
             if args:
                 self.onecmd(" ".join(args))
             else:
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index ab3b6450f..9ceb1dd04 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -73,7 +73,7 @@ def load_server(setup):
     """ load server """
     core = Bcfg2.Server.Core.BaseCore(setup)
     core.load_plugins()
-    core.fam.handle_events_in_interval(0.1)
+    core.block_for_fam_events(handle_events=True)
     return core
 
 
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index a7a6781a9..7c38a65d8 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -157,7 +157,7 @@ def get_core(setup):
     """ Get a server core, with events handled """
     core = Bcfg2.Server.Core.BaseCore(setup)
     core.load_plugins()
-    core.fam.handle_events_in_interval(0.1)
+    core.block_for_fam_events(handle_events=True)
     return core