diff --git a/src/libnm-client-impl/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c
index 39831509b9..da252549a7 100644
--- a/src/libnm-client-impl/tests/test-nm-client.c
+++ b/src/libnm-client-impl/tests/test-nm-client.c
@@ -1432,13 +1432,13 @@ test_client_wait_shutdown(void)
     nmtst_assert_success(dbus_connection, error);
 
     for (i_run = 0; i_run < N_RUN; i_run++) {
-        gs_unref_object GCancellable          *init_cancellable = g_cancellable_new();
-        gs_unref_object NMClient              *nmc              = NULL;
-        nm_auto_pop_gmaincontext GMainContext *client_context   = NULL;
-        gboolean                               b;
-        gboolean                               context_integrated = FALSE;
-        gs_unref_object GCancellable          *cancellable_1      = NULL;
-        GMainContext                          *ctx;
+        gs_unref_object GCancellable                    *init_cancellable = g_cancellable_new();
+        gs_unref_object NMClient                        *nmc              = NULL;
+        nm_auto_pop_and_unref_gmaincontext GMainContext *client_context   = NULL;
+        gboolean                                         b;
+        gboolean                                         context_integrated = FALSE;
+        gs_unref_object GCancellable                    *cancellable_1      = NULL;
+        GMainContext                                    *ctx;
 
         /* Choose a random context for the client. */
         ctx = contexts->pdata[nmtst_get_rand_uint32() % contexts->len];
diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py
index 9598aa0751..6220587a9b 100755
--- a/src/tests/client/test-client.py
+++ b/src/tests/client/test-client.py
@@ -2227,9 +2227,9 @@ class TestNmcli(unittest.TestCase):
             extra_env=no_dbus_env,
             replace_stderr=[
                 Util.ReplaceTextRegex(
-                    # depending on glib version, it prints `%s', '%s', or “%s”.
-                    # depending on libc version, it converts unicode to ? or *.
-                    r"Key/Value pair 0, [`*?']invalid[*?'], in address element [`*?']very:invalid[*?'] does not contain an equal sign",
+                    # Depending on glib version, it prints `%s', '%s', or “%s”.
+                    # Some libc versions convert the multi-byte UTF-8 sequence to ? or *.
+                    r"Key/Value pair 0, .*invalid.*, in address element .*very:invalid.* does not contain an equal sign",
                     "Key/Value pair 0, 'invalid', in address element 'very:invalid' does not contain an equal sign",
                 )
             ],