diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c
index 301a48d883..a13e8311cb 100644
--- a/libnm-glib/tests/test-remote-settings-client.c
+++ b/libnm-glib/tests/test-remote-settings-client.c
@@ -49,9 +49,12 @@ cleanup (void)
 
 #define test_assert(condition) \
 do { \
-	if (!G_LIKELY (condition)) \
+	gboolean _condition = ( condition ); \
+	\
+	if (G_UNLIKELY (!_condition)) { \
 		cleanup (); \
-	g_assert (condition); \
+		g_assert (!"test_assert() failed for" # condition); \
+	} \
 } while (0)
 
 /*******************************************************************/