diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
index 5612da1269..aa2c94d088 100644
--- a/libnm-glib/tests/test-nm-client.c
+++ b/libnm-glib/tests/test-nm-client.c
@@ -284,10 +284,6 @@ test_device_added (void)
 
 	service_init ();
 
-	/* Give NMClient a chance to initialize */
-	g_timeout_add_seconds (5, loop_quit, loop);
-	g_main_loop_run (loop);
-
 	devices = nm_client_get_devices (_sinfo->client);
 	test_assert (devices == NULL);
 
@@ -442,10 +438,6 @@ test_wifi_ap_added_removed (void)
 
 	service_init ();
 
-	/* Give NMClient a chance to initialize */
-	g_timeout_add_seconds (5, loop_quit, loop);
-	g_main_loop_run (loop);
-
 	/*************************************/
 	/* Add the wifi device */
 	add_device ("AddWifiDevice", "wlan0", NULL);
@@ -665,10 +657,6 @@ test_wimax_nsp_added_removed (void)
 
 	service_init ();
 
-	/* Give NMClient a chance to initialize */
-	g_timeout_add_seconds (5, loop_quit, loop);
-	g_main_loop_run (loop);
-
 	/*************************************/
 	/* Add the wimax device */
 	add_device ("AddWimaxDevice", "wmx0", NULL);
@@ -849,10 +837,6 @@ test_devices_array (void)
 
 	service_init ();
 
-	/* Give NMClient a chance to initialize */
-	g_timeout_add_seconds (5, loop_quit, loop);
-	g_main_loop_run (loop);
-
 	/*************************************/
 	/* Add some devices */
 	add_device ("AddWifiDevice", "wlan0", &paths[0]);