diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py
index 6f32712c339..ff84befda45 100644
--- a/python/samba/tests/auth_log.py
+++ b/python/samba/tests/auth_log.py
@@ -250,16 +250,16 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
             binding = "[%s]" % binding
 
         if service == "dnsserver":
-            dnsserver.dnsserver("ncacn_ip_tcp:%s%s" % (self.server, binding),
-                                self.get_loadparm(),
-                                creds)
+            conn = dnsserver.dnsserver("ncacn_ip_tcp:%s%s" % (self.server, binding),
+                                       self.get_loadparm(),
+                                       creds)
         elif service == "srvsvc":
-           srvsvc.srvsvc("ncacn_ip_tcp:%s%s" % (self.server, binding),
-                         self.get_loadparm(),
-                         creds)
+            conn = srvsvc.srvsvc("ncacn_ip_tcp:%s%s" % (self.server, binding),
+                                 self.get_loadparm(),
+                                 creds)
 
 
-        messages = self.waitForMessages(isLastExpectedMessage)
+        messages = self.waitForMessages(isLastExpectedMessage, conn)
         checkFunction(messages, authTypes, service, binding, protection)
 
     def rpc_ncacn_ip_tcp_ntlm_check(self, messages, authTypes, service,
diff --git a/python/samba/tests/auth_log_samlogon.py b/python/samba/tests/auth_log_samlogon.py
index cbef5a19308..d24986b68a5 100644
--- a/python/samba/tests/auth_log_samlogon.py
+++ b/python/samba/tests/auth_log_samlogon.py
@@ -152,7 +152,7 @@ class AuthLogTestsSamLogon(samba.tests.auth_log_base.AuthLogTestBase):
         (validation, authoritative, netr_flags_out) = result
 
 
-        messages = self.waitForMessages(isLastExpectedMessage)
+        messages = self.waitForMessages(isLastExpectedMessage, netlogon_conn)
         checkFunction(messages)
 
     def samlogon_check(self, messages):