diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected
index a611021262..12344984b7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-003.expected
@@ -1,13 +1,13 @@
 location: clients/tests/test-client.py:812:test_004()/3
 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1
-lang: C
+lang: pl_PL.UTF-8
 returncode: 1
 stdout: 0 bytes
 >>>
 
 <<<
-stderr: 119 bytes
+stderr: 143 bytes
 >>>
-Error: Failed to modify connection 'con-xx1': ipv4.gateway: gateway cannot be set if there are no addresses configured
+Błąd: zmodyfikowanie połączenia „con-xx1” się nie powiodło: ipv4.gateway: gateway cannot be set if there are no addresses configured
 
 <<<
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index 230d83102e..7f0742a391 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -809,7 +809,7 @@ class TestNmcli(NmTestBase):
                         replace_stdout = replace_stdout)
 
         self.call_nmcli(['connection', 'mod', 'con-xx1', 'ip.gateway', ''])
-        self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1'])
+        self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1'], lang = 'pl')
         self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv6.gateway', '::99'])
         self.call_nmcli(['connection', 'mod', 'con-xx1', '802.abc', ''])
         self.call_nmcli(['connection', 'mod', 'con-xx1', '802-11-wireless.band', 'a'])
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
index 19e0fdcc12..2e9dcdb296 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -109,7 +109,7 @@ class Util:
                 if val.signature == 'au':
                     return GLib.Variant('aau', [Util.variant_from_dbus(x) for x in val])
                 if val.signature == 'a{sv}':
-                    return GLib.Variant('aa{sv}', [(str(k), Util.variant_from_dbus(v)) for k, v in val])
+                    return GLib.Variant('aa{sv}', [collections.OrderedDict([(str(k), Util.variant_from_dbus(v)) for k, v in addr.items()]) for addr in val])
                 if val.signature == '(ayuay)':
                     return GLib.Variant('a(ayuay)', [Util.variant_from_dbus(x) for x in val])
                 if val.signature == '(ayuayu)':