diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
index 58822734f..6862f13e0 100644
--- a/src/platform/tests/test-route.c
+++ b/src/platform/tests/test-route.c
@@ -250,8 +250,6 @@ test_ip6_route (void)
 	/* Choose a high metric so that we hopefully don't conflict. */
 	int metric = 22987;
 	int mss = 1000;
-	const NMPlatformIP6Address *plt_addr;
-	gint64 time_start;
 
 	inet_pton (AF_INET6, "2001:db8:a:b:0:0:0:0", &network);
 	inet_pton (AF_INET6, "2001:db8:c:d:1:2:3:4", &gateway);
@@ -265,16 +263,15 @@ test_ip6_route (void)
 	 * and thus don't do DAD, but the kernel sets the address as tentative for a
 	 * small amount of time, which prevents the immediate addition of the route
 	 * with RTA_PREFSRC */
-	time_start = nm_utils_get_monotonic_timestamp_ms ();
-	while (TRUE) {
+	NMTST_WAIT_ASSERT (200, {
+		const NMPlatformIP6Address *plt_addr;
+
+		nmtstp_wait_for_signal (NM_PLATFORM_GET, 50);
 		nm_platform_process_events (NM_PLATFORM_GET);
 		plt_addr = nm_platform_ip6_address_get (NM_PLATFORM_GET, ifindex, pref_src, 128);
 		if (plt_addr && !NM_FLAGS_HAS (plt_addr->n_ifa_flags, IFA_F_TENTATIVE))
 			break;
-		if (nm_utils_get_monotonic_timestamp_ms() - time_start > 2000)
-			g_assert_not_reached();
-		g_usleep (100);
-	}
+	});
 
 	/* Add route to gateway */
 	nmtstp_ip6_route_add (NM_PLATFORM_GET, ifindex, NM_IP_CONFIG_SOURCE_USER, gateway, 128, in6addr_any, in6addr_any, metric, mss);