1 files changed, 1 insertions, 8 deletions
diff --git a/tests/libdbusmock-fixture.h b/tests/libdbusmock-fixture.h
index 14eab8f..7301042 100644
--- a/tests/libdbusmock-fixture.h
+++ b/tests/libdbusmock-fixture.h
@@ -75,14 +75,7 @@ protected:
 
     // wait a little while for the scaffolding to shut down,
     // but don't block on it forever...
-    unsigned int cleartry = 0;
-    while (((system_bus != nullptr) || (session_bus != nullptr)) && (cleartry < 50))
-      {
-        g_usleep(100000);
-        while (g_main_pending())
-          g_main_iteration(true);
-        cleartry++;
-      }
+    wait_for([this](){return system_bus==nullptr && session_bus==nullptr;}, 5000);
 
     super::TearDown();
   }