diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index dc867cd1d4..e8ddf15a84 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -423,16 +423,32 @@ def clear_udev_rules():
     rm_rf(udev_rules_dir)
 
 def save_active_units():
-    for u in ['systemd-networkd.socket', 'systemd-networkd.service',
-              'systemd-resolved.service', 'systemd-timesyncd.service',
-              'firewalld.service']:
+    for u in [
+            'systemd-networkd.socket',
+            'systemd-networkd-varlink.socket',
+            'systemd-networkd.service',
+            'systemd-resolved.service',
+            'systemd-timesyncd.service',
+            'firewalld.service'
+    ]:
         if call(f'systemctl is-active --quiet {u}') == 0:
             call(f'systemctl stop {u}')
             active_units.append(u)
 
 def restore_active_units():
+    has_socket = False
+
     if 'systemd-networkd.socket' in active_units:
-        call('systemctl stop systemd-networkd.socket systemd-networkd.service')
+        call('systemctl stop systemd-networkd.socket')
+        has_socket = True
+
+    if 'systemd-networkd-varlink.socket' in active_units:
+        call('systemctl stop systemd-networkd-varlink.socket')
+        has_socket = True
+
+    if has_socket:
+        call('systemctl stop systemd-networkd.service')
+
     for u in active_units:
         call(f'systemctl restart {u}')
 
@@ -482,6 +498,7 @@ def setup_system_units():
         for unit in [
                 'systemd-networkd.service',
                 'systemd-networkd.socket',
+                'systemd-networkd-varlink.socket',
                 'systemd-networkd-persistent-storage.service',
                 'systemd-resolved.service',
                 'systemd-timesyncd.service',
@@ -522,6 +539,13 @@ def setup_system_units():
             'StartLimitIntervalSec=0',
         ]
     )
+    create_unit_dropin(
+        'systemd-networkd-varlink.socket',
+        [
+            '[Unit]',
+            'StartLimitIntervalSec=0',
+        ]
+    )
     create_unit_dropin(
         'systemd-networkd-persistent-storage.service',
         [
@@ -553,6 +577,7 @@ def clear_system_units():
 
     rm_unit('systemd-networkd.service')
     rm_unit('systemd-networkd.socket')
+    rm_unit('systemd-networkd-varlink.socket')
     rm_unit('systemd-networkd-persistent-storage.service')
     rm_unit('systemd-resolved.service')
     rm_unit('systemd-timesyncd.service')
@@ -938,9 +963,11 @@ def stop_networkd(show_logs=True, check_failed=True):
 
     if check_failed:
         check_output('systemctl stop systemd-networkd.socket')
+        check_output('systemctl stop systemd-networkd-varlink.socket')
         check_output('systemctl stop systemd-networkd.service')
     else:
         call('systemctl stop systemd-networkd.socket')
+        call('systemctl stop systemd-networkd-varlink.socket')
         call('systemctl stop systemd-networkd.service')
 
     if show_logs: