diff --git a/test/nbft/diffs/NBFT-empty b/test/nbft/diffs/NBFT-empty
new file mode 100644
index 000000000..b8b84e15d
--- /dev/null
+++ b/test/nbft/diffs/NBFT-empty
@@ -0,0 +1,6 @@
+raw_nbft_size=315
+host.id=78563412aaaabbbbcccc123456789012
+host.nqn=nqn.2014-08.org.nvmexpress:uuid:12345678-aaaa-bbbb-cccc-123456789012
+host.host_id_configured=1
+host.host_nqn_configured=1
+host.primary=0
diff --git a/test/nbft/diffs/NBFT-ipv6-noip+disc b/test/nbft/diffs/NBFT-ipv6-noip+disc
new file mode 100644
index 000000000..620912f1c
--- /dev/null
+++ b/test/nbft/diffs/NBFT-ipv6-noip+disc
@@ -0,0 +1,45 @@
+raw_nbft_size=785
+host.id=78563412aaaabbbbcccc123456789012
+host.nqn=nqn.2014-08.org.nvmexpress:uuid:12345678-aaaa-bbbb-cccc-123456789012
+host.host_id_configured=1
+host.host_nqn_configured=1
+host.primary=0
+hfi_list[0]->index=1
+hfi_list[0]->transport=tcp
+hfi_list[0]->tcp_info.pci_sbdf=3329
+hfi_list[0]->tcp_info.mac_addr=40a6b7c08ac9
+hfi_list[0]->tcp_info.vlan=0
+hfi_list[0]->tcp_info.ip_origin=3
+hfi_list[0]->tcp_info.ipaddr=::
+hfi_list[0]->tcp_info.subnet_mask_prefix=0
+hfi_list[0]->tcp_info.gateway_ipaddr=::
+hfi_list[0]->tcp_info.route_metric=500
+hfi_list[0]->tcp_info.primary_dns_ipaddr=::
+hfi_list[0]->tcp_info.secondary_dns_ipaddr=::
+hfi_list[0]->tcp_info.dhcp_server_ipaddr=::
+hfi_list[0]->tcp_info.host_name=(null)
+hfi_list[0]->tcp_info.this_hfi_is_default_route=1
+hfi_list[0]->tcp_info.dhcp_override=1
+discovery_list[0]->index=1
+discovery_list[0]->hfi->index=1
+discovery_list[0]->uri=nvme+tcp://[4321:BBBB::1]:4420/
+discovery_list[0]->nqn=nqn.2014-08.org.nvmexpress.discovery
+subsystem_ns_list[0]->index=1
+subsystem_ns_list[0]->discovery->index=1
+subsystem_ns_list[0]->num_hfis=1
+subsystem_ns_list[0]->hfis[0]->index=1
+subsystem_ns_list[0]->transport=tcp
+subsystem_ns_list[0]->traddr=4321:bbbb::1
+subsystem_ns_list[0]->trsvcid=4420
+subsystem_ns_list[0]->subsys_port_id=0
+subsystem_ns_list[0]->nsid=0
+subsystem_ns_list[0]->nid_type=0
+subsystem_ns_list[0]->nid=0000000000000000
+subsystem_ns_list[0]->subsys_nqn=nqn.2014-08.org.nvmexpress.discovery
+subsystem_ns_list[0]->pdu_header_digest_required=0
+subsystem_ns_list[0]->data_digest_required=0
+subsystem_ns_list[0]->controller_id=0
+subsystem_ns_list[0]->asqsz=0
+subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=1
+subsystem_ns_list[0]->unavailable=1
diff --git a/test/nbft/meson.build b/test/nbft/meson.build
index 7882df612..fcef93440 100644
--- a/test/nbft/meson.build
+++ b/test/nbft/meson.build
@@ -21,7 +21,9 @@ tables = [
     'NBFT-Dell.PowerEdge.R760',
     'NBFT-Dell.PowerEdge.R660-fw1.5.5-single',
     'NBFT-Dell.PowerEdge.R660-fw1.5.5-mpath+discovery',
-    'NBFT-mpath+disc-ipv4+6_half'
+    'NBFT-mpath+disc-ipv4+6_half',
+    'NBFT-ipv6-noip+disc',
+    'NBFT-empty'
 ]
 
 tables_bad = [
diff --git a/test/nbft/tables/NBFT-empty b/test/nbft/tables/NBFT-empty
new file mode 100644
index 000000000..b558b6c5a
Binary files /dev/null and b/test/nbft/tables/NBFT-empty differ
diff --git a/test/nbft/tables/NBFT-ipv6-noip+disc b/test/nbft/tables/NBFT-ipv6-noip+disc
new file mode 100644
index 000000000..7a0690cb9
Binary files /dev/null and b/test/nbft/tables/NBFT-ipv6-noip+disc differ