diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index f29e42e77faaec2ad83a19da581d38c1fd0f9075..aa0346b66f56cc5867482971283c4f128c62ff6d 100644
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -50,18 +50,23 @@ int virDomainEventCallbackListAdd(virConnectPtr conn,
                                   virDomainEventCallbackListPtr cbList,
                                   virConnectDomainEventCallback callback,
                                   void *opaque,
-                                  virFreeCallback freecb);
+                                  virFreeCallback freecb)
+    ATTRIBUTE_NONNULL(1);
 
 int virDomainEventCallbackListRemove(virConnectPtr conn,
                                      virDomainEventCallbackListPtr cbList,
-                                     virConnectDomainEventCallback callback);
+                                     virConnectDomainEventCallback callback)
+    ATTRIBUTE_NONNULL(1);
 
 int virDomainEventCallbackListRemoveConn(virConnectPtr conn,
-                                         virDomainEventCallbackListPtr cbList);
+                                         virDomainEventCallbackListPtr cbList)
+    ATTRIBUTE_NONNULL(1);
 
 int virDomainEventCallbackListMarkDelete(virConnectPtr conn,
                                          virDomainEventCallbackListPtr cbList,
-                                         virConnectDomainEventCallback callback);
+                                         virConnectDomainEventCallback callback)
+    ATTRIBUTE_NONNULL(1);
+
 int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList);
 
 /**
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 5c41a1aafd23b3f85f01d79bd085c4cfc5a18bd7..d26bb9093be35e72fd358437bb49a7a6981f5fab 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -188,7 +188,8 @@ int         qemudBuildCommandLine       (virConnectPtr conn,
                                          const char ***retenv,
                                          int **tapfds,
                                          int *ntapfds,
-                                         const char *migrateFrom);
+                                         const char *migrateFrom)
+    ATTRIBUTE_NONNULL(1);
 
 /* With vlan == -1, use netdev syntax, else old hostnet */
 char * qemuBuildHostNetStr(virDomainNetDefPtr net,
@@ -241,7 +242,8 @@ char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev);
 int         qemudNetworkIfaceConnect    (virConnectPtr conn,
                                          struct qemud_driver *driver,
                                          virDomainNetDefPtr net,
-                                         unsigned long long qemuCmdFlags);
+                                         unsigned long long qemuCmdFlags)
+    ATTRIBUTE_NONNULL(1);
 
 int         qemudProbeMachineTypes      (const char *binary,
                                          virCapsGuestMachinePtr **machines,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8bdab493360450b37813781d81bea960c5094fbb..3ee71a3b1b2239ed08c7a635dcb5330c0daf2769 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -13,6 +13,7 @@
 #include "internal.h"
 #include "testutils.h"
 #include "qemu/qemu_conf.h"
+#include "datatypes.h"
 
 #include "testutilsqemu.h"
 
@@ -36,6 +37,10 @@ static int testCompareXMLToArgvFiles(const char *xml,
     unsigned long long flags;
     virDomainDefPtr vmdef = NULL;
     virDomainChrDef monitor_chr;
+    virConnectPtr conn;
+
+    if (!(conn = virGetConnect()))
+        goto fail;
 
     if (virtTestLoadFile(cmd, &expectargv, MAX_FILE) < 0)
         goto fail;
@@ -75,7 +80,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     }
 
 
-    if (qemudBuildCommandLine(NULL, &driver,
+    if (qemudBuildCommandLine(conn, &driver,
                               vmdef, &monitor_chr, 0, flags,
                               &argv, &qenv,
                               NULL, NULL, migrateFrom) < 0)
@@ -137,6 +142,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
         free(qenv);
     }
     virDomainDefFree(vmdef);
+    virUnrefConnect(conn);
     return ret;
 }