diff --git a/tests/nssdata/virbr1.status b/tests/nssdata/virbr1.status
index 4951d4513e..f73c478be0 100644
--- a/tests/nssdata/virbr1.status
+++ b/tests/nssdata/virbr1.status
@@ -20,6 +20,7 @@
     {
         "ip-address": "192.168.122.3",
         "mac-address": "52:54:00:aa:bb:cc",
+        "client-id": "01:52:54:00:aa:bb:cc",
         "expiry-time": 2000000000
     }
 ]
diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c
index 86881641a9..577b5a2fd1 100644
--- a/tools/nss/libvirt_nss_leases.c
+++ b/tools/nss/libvirt_nss_leases.c
@@ -201,7 +201,7 @@ findLeasesParserString(void *ctx,
             if (!(parser->entry.hostname = strndup((char *)stringVal, stringLen)))
                 return 0;
         } else {
-            return 0;
+            return 1;
         }
     } else {
         return 0;
diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c
index 26ba4bf515..ef14ef0a24 100644
--- a/tools/nss/libvirt_nss_macs.c
+++ b/tools/nss/libvirt_nss_macs.c
@@ -68,7 +68,7 @@ findMACsParserString(void *ctx,
 
     if (parser->state == FIND_MACS_STATE_ENTRY) {
         if (strcmp(parser->key, "domain"))
-            return 0;
+            return 1;
 
         free(parser->entry.name);
         if (!(parser->entry.name = strndup((char *)stringVal, stringLen)))
@@ -76,7 +76,7 @@ findMACsParserString(void *ctx,
     } else if (parser->state == FIND_MACS_STATE_ENTRY_MACS) {
         char **macs;
         if (strcmp(parser->key, "macs"))
-            return 0;
+            return 1;
 
         if (!(macs = realloc(parser->entry.macs,
                              sizeof(char *) * (parser->entry.nmacs + 1))))