6 files changed, 65 insertions, 5 deletions
diff --git a/tests-extra/tests/records/load/data/knot-only.zone b/tests-extra/tests/records/load/data/knot-only.zone
new file mode 100644
index 000000000..026246968
--- /dev/null
+++ b/tests-extra/tests/records/load/data/knot-only.zone
@@ -0,0 +1,9 @@
+$ORIGIN knot-only.
+$TTL 3600
+
+@	SOA	dns1 hostmaster 1 100 100 1000 600
+	NS	dns1
+dns1	A	192.0.2.1
+
+wallet WALLET	"BTC" "bc1qf2kdgu2vlctqlnlxk4smkxd68grl5q2we8dzfd"
+wallet WALLET	"ETH" "0x87D487fa59274545743949BE4282EA87F316821E"
diff --git a/tests-extra/tests/records/load/test.py b/tests-extra/tests/records/load/test.py
index 4bc4b1f8e..f435bfffd 100644
--- a/tests-extra/tests/records/load/test.py
+++ b/tests-extra/tests/records/load/test.py
@@ -6,13 +6,17 @@ from dnstest.test import Test
 
 t = Test()
 
+pre_master = t.server("knot") # For records unknown to Bind.
 master = t.server("bind")
 slave = t.server("knot")
 reference = t.server("knot")
 
-zones = t.zone_rnd(2) + t.zone(".") + t.zone("records.") + t.zone("svcb", storage=".") + \
-        t.zone("future", storage=".")
+zones_both = t.zone_rnd(2) + t.zone(".") + t.zone("records.") + t.zone("svcb", storage=".") + \
+             t.zone("future", storage=".")
+zones_knot = t.zone("knot-only", storage=".")
+zones = zones_both + zones_knot
 
+t.link(zones_knot, pre_master, master)
 t.link(zones, master, slave)
 t.link(zones, reference)
 
@@ -20,8 +24,8 @@ t.start()
 
 # Wait for servers.
 master.zones_wait(zones)
-slave.zones_wait(zones)
-reference.zones_wait(zones)
+slave.zones_wait(zones + zones_knot)
+reference.zones_wait(zones + zones_knot)
 
 # Dump zones on slave.
 slave.flush(wait=True)
diff --git a/tests/libzscanner/TESTS b/tests/libzscanner/TESTS
index 227cdb4c1..1ac5755b6 100644
--- a/tests/libzscanner/TESTS
+++ b/tests/libzscanner/TESTS
@@ -84,3 +84,4 @@
 56_ZONEMD
 57_SVCB
 58_HTTPS
+59_WALLET
diff --git a/tests/libzscanner/data/59_WALLET.in b/tests/libzscanner/data/59_WALLET.in
new file mode 100644
index 000000000..976750659
--- /dev/null
+++ b/tests/libzscanner/data/59_WALLET.in
@@ -0,0 +1,14 @@
+$ORIGIN	.
+$TTL	1
+
+; The WALLET is the same as the TXT, so there are the differences and basics only.
+
+; OK
+@	WALLET	"" "test1" "\255" test2		; Array of text strings
+@	WALLET	\# 1 00				; Hexadecimal rdata
+@	TYPE262	\# 1 00				; TYPE + Hexadecimal rdata
+@	TYPE262	""				; TYPE
+@	wallet	""				; Type in lower-case
+
+; KO
+@	WALLET
diff --git a/tests/libzscanner/data/59_WALLET.out b/tests/libzscanner/data/59_WALLET.out
new file mode 100644
index 000000000..11e642559
--- /dev/null
+++ b/tests/libzscanner/data/59_WALLET.out
@@ -0,0 +1,32 @@
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0106
+RDATA=0005746573743101FF057465737432
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0106
+RDATA=00
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0106
+RDATA=00
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0106
+RDATA=00
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0106
+RDATA=00
+------
+WARNG=ZS_BAD_RDATA
+------
diff --git a/tests/libzscanner/test_zscanner.in b/tests/libzscanner/test_zscanner.in
index 10d2b5ce8..8cc9008e6 100644
--- a/tests/libzscanner/test_zscanner.in
+++ b/tests/libzscanner/test_zscanner.in
@@ -11,7 +11,7 @@ TMPDIR=$(test_tmpdir)
 TESTS_DIR="$SOURCE"/data
 ZSCANNER_TOOL="$BUILD"/zscanner-tool
 
-plan 86
+plan 87
 
 mkdir -p "$TMPDIR"/includes/
 for a in 1 2 3 4 5 6; do