diff --git a/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone
new file mode 100644
index 0000000000000000000000000000000000000000..8a1af1e3ce59d11842d931232be145137267007d
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 2010111201 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone.1 b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone.1
new file mode 100644
index 0000000000000000000000000000000000000000..b17d89d54d7287d441fea7dad007331a8a349a13
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone.1
@@ -0,0 +1,19 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 2010111202 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
+
+deleg NS n.deleg
+n.deleg A 1.2.3.4
diff --git a/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone.2 b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone.2
new file mode 100644
index 0000000000000000000000000000000000000000..02b1436de6ea275b824bc046b5f3c92fe8f9f816
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/example.com.zone.2
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 2010111203 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/step.py b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/step.py
new file mode 100644
index 0000000000000000000000000000000000000000..830c2cdafe857ad037d25b83d88794b840f39fbe
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/06_add_rm_delegation/step.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+'''Add and remove zone delegation.'''
+
+def run(i):
+ i.test.start()
+
+ i.check()
+ i.check_rec("deleg", "NS", rcode="NXDOMAIN")
+ i.check_rec("n.deleg", "A", rcode="NXDOMAIN")
+
+ i.check(1)
+ i.check_rec("deleg", "NS", rcode="NOERROR", nordata="n.deleg.example.com.")
+ i.check_rec("n.deleg", "A", rcode="NOERROR", nordata="1.2.3.4")
+
+ i.check(2)
+ i.check_rec("deleg", "NS", rcode="NXDOMAIN")
+ i.check_rec("n.deleg", "A", rcode="NXDOMAIN")
+
+ i.test.end()
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone
new file mode 100644
index 0000000000000000000000000000000000000000..50847b6f471146984856d76e7d812c2aa46817d6
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 1 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.1 b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.1
new file mode 100644
index 0000000000000000000000000000000000000000..04a7405b02440b7d3036e7d79ebb263da2606812
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.1
@@ -0,0 +1,33 @@
+; File written on Thu Apr 24 15:36:15 2014
+; dnssec_signzone version 9.9.3-rpz2+rl.13214.22-P2-Ubuntu-1:9.9.3.dfsg.P2-4ubuntu1.1
+example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. 2 10800 3600 1209600 7200
+example.com. 3600 IN RRSIG SOA 5 2 3600 20500101000000 20140424123615 48270 example.com. gQGAbBtUeCMVS/3vvWI7wcAt/Bp0vB8G0Bn8D0NxEQli66pWACaYWNYF 6zvsGq2pXdIJ+7GwvYsW6bEZWdWK4JwycT1ttagZEPGgpvJbZ2t+q7QM OeiwsnQhIdkLe+VElnWKOQvlwZ4lcJB3ohJpUiPGIGX7PMOb1WExwgK7 vuk=
+example.com. 3600 IN NS dns1.example.com.
+example.com. 3600 IN NS dns2.example.com.
+example.com. 3600 IN RRSIG NS 5 2 3600 20500101000000 20140424123615 48270 example.com. kf9lGUN7Q7U9IXgioaXFVc4R2neyl8vEZVhr6oH0OAS+KcBp3mdkGril uyHh8TzzaU3DKUVnzZ3VDh2UXHDEHm2Eford50uv6qwUNinsihz27eDs YoWeNb9GEJHBQuiqJVnTtus3Ky7/Zy6ZW0cHsSew30ZDW1hEhkCvxJsg i/w=
+example.com. 3600 IN MX 10 mail.example.com.
+example.com. 3600 IN RRSIG MX 5 2 3600 20500101000000 20140424123615 48270 example.com. PqZSV2LBI/qZUQIHCiwyNWPbll35kDSvXp//663PIqYWRatgapgsSz03 xwcbELsDLExyWQLKHF5X3tSAnLM2OJRSjqIUxE38igwOLHUgHt80X7wW vTlneO03RlvueawqpUTh28IkV2XeY7ce8yt26Wn5EgxJAgsZixQhGCgh R9s=
+example.com. 7200 IN NSEC dns1.example.com. NS SOA MX RRSIG NSEC DNSKEY
+example.com. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140424123615 48270 example.com. UiaiqUSvkWJRESjo3swSxG2RnvPOSpuI1AwGD+ioBAAuc7PfjtSl1fsw jr3WCLzkbWQ/5EtUyMSWcBRzhJ+Lwf3jWD63HoxMH2eu1+3kCDv0zuKX /vx1edAMkj3WFYaJeyG63uU8d0Ki67HF2XXsFVjHoasTdAtByGTP/EJh 9RA=
+example.com. 3600 IN DNSKEY 256 3 5 AwEAAZ6S/hD++6IvF+3J+SsG3gAPAzkvsoCfmrlbW/O2Vl2lE41KcUi2 gnanCQnd2c626UMu8HUP/LChnshuryyI3OIVqPl5tkTO6lQIsI0zrgTg X0W+qrZy2ScbJzX3Q8DX2Rc6Fvv6FrH3STjEbTRG3/S2S3Fjej/9hHfA ZZkhg80T
+example.com. 3600 IN DNSKEY 257 3 5 AwEAAbJGcGQXbTcHfb8iHLl6vVcl9kIqSkATG3h/ea77o7Dvb2Se77Bd wscYTTsydX0s6LEO6cfaknupcYRoOY5lRFHPBOT87dyA7+REmdM2yEZB dWDkXJi6px0k30Md6aY1t1dHLOj3Vgmmf9nGgkCH4rsx3lpsG+GGz0gb 8mqDKxNav4iB9muqnQhb6ar1KEHT23bqrbyq+w8EnOd7sjrGE6Jc46Q+ qH1ppIs2MupDEtYSJvdfEzF+FIo/ET5xKjJsdSf0RlTGFyCQYCHcQOxJ 5vvaczhrvg6rLPdYBD4vpUlvP6JaBrEzSVu1JKewloFCD472bLsLuMBd rew16iFvvik=
+example.com. 3600 IN RRSIG DNSKEY 5 2 3600 20500101000000 20140424123615 15742 example.com. qhDj7xaAlrfxufWAZpg6123znruaVYeTIVE1QCpjUmGUYl8Q3B8EEogl J6RRMuG6f3qMr9VO9wsNyG5vbNvHywdto9S11WrLK9w93ECvXJd6/Sx5 0cdnOOM7HQCyp7r1+OjreDOq09knLjz80hVsA19dtTax0rBW8pg6v7Eo JKzzPw/Yb8G/HCkKtjgObnhYEuQ5U+3WVopgIFONlBm2zjyEJHFSxFEo o4SMXrkcScOPGAI3i9lHkkzdOaVN2v+3h6JjB9BrtOuo3IxpOKBq3ZiT QMKH3Ht2SCbLwwg3AHtmQbj3w31V3kOIw/2AFzfJ7PSPifBC+yNps1AN U9WjxQ==
+example.com. 3600 IN RRSIG DNSKEY 5 2 3600 20500101000000 20140424123615 48270 example.com. Cmeefl4s85b2nWTF5Dvkehe52CnrJWsVaZ2mYzlGfxwlAwOSrrdAJ11p DZgvpKJO5csnj8wrM47s7Rpab+X/RvssoTa99d/1jNSwV9eNqL5bN3t9 55XW6NDZNxnWWo2hYWdm424S25f9UISW6/IMYJfAqw89KfB3gLysCOBC wLY=
+dns2.example.com. 3600 IN A 192.0.2.2
+dns2.example.com. 3600 IN RRSIG A 5 3 3600 20500101000000 20140424123615 48270 example.com. l9QHTA3h6aGJ20bLkwMq+oIkir/6PJFZeAf8E4TpIDj5LvhCB6cDCF54 L4LsYI+whCI6tTKNblI8oEEPQX5pS73qCpmokZj91p1qtnfJZB7rQ4dq vrr58qMu/3QkIXwgbunGShiH1XDxvAQ3KKNjbKd6SrkDEvD2NwjOvjDG laY=
+dns2.example.com. 3600 IN AAAA 2001:db8::2
+dns2.example.com. 3600 IN RRSIG AAAA 5 3 3600 20500101000000 20140424123615 48270 example.com. Vezum4H/yCj7V9TsUwF2Es4YRC+JhpWe0i8g24ivtAY4W6g+0rIX0Eeg PP1bI8/Flcn6OGVJScwBLYCt68RldFaBkmZzUTwkvrBU07qUFPK3e8bW yVVYyBJRps0DElhiycxS+EM4NXPo3ZlpbfFLGAsERhuOOZJTCoXop3ME 530=
+dns2.example.com. 7200 IN NSEC mail.example.com. A AAAA RRSIG NSEC
+dns2.example.com. 7200 IN RRSIG NSEC 5 3 7200 20500101000000 20140424123615 48270 example.com. LYuUHK1flf+YAnyufmTE2C/sbBQkPeirKuU6G4ZYQAZEkKtbj69ai33N O/FvSZJk3CuVXZPPepDEkDgqfUYFLovnA9LWNyA+M+DwLTqlym6cheDo NJDyu1Tlk8S8RviajExkGzNgFrcH3Y7ir1WV13KE4tyDcqZttQu0/GCa dn0=
+dns1.example.com. 3600 IN A 192.0.2.1
+dns1.example.com. 3600 IN RRSIG A 5 3 3600 20500101000000 20140424123615 48270 example.com. geHqQ+BblAWCUIsrU2tmhTQB7Aq4c7wS9A0XrKI/vNfe4KTx7fohByR4 yZ0vqyRkcrCOdJXCCSqGNHoiw9aSVOlG7Wf0ZQjSbMDL5qyX72IbbHId 5XfUVf9l6ioAFu0j3aq6iJnVdNTYAwbVrwE2+bUVqkFRshkddLHm8LVb a90=
+dns1.example.com. 3600 IN AAAA 2001:db8::1
+dns1.example.com. 3600 IN RRSIG AAAA 5 3 3600 20500101000000 20140424123615 48270 example.com. SjVTNc9/haQy7vLcmPfZePxgkNEiiBcTBIN+v42O3ZStW99tfBv7vGOp RJaJRFRuofUXE8qgRB/5nZD3Qcfu3a0auGUQnPQlshHZcIK0i7V9R3Oz Id/p/daQ+LNioh4Pwgn42Gs/yjxoEQSyKQpdq1G0l6nVEcehrNPmTy9l cUo=
+dns1.example.com. 7200 IN NSEC dns2.example.com. A AAAA RRSIG NSEC
+dns1.example.com. 7200 IN RRSIG NSEC 5 3 7200 20500101000000 20140424123615 48270 example.com. VKhFCmX5VWwjMxFl+//VI/Te8e6QnDKDKmu342y0KXojqJAXVGjwJR6T B0VwHk/cp2VfU4P/nUeD8TZdHAXTlsqntYBezYCAyZ6EDIBnIxFeIqPa SJlv2br5y6LEfxaqc+ulKuWebcHNG2NWGu4hlcD7/9gQ8G8g6fsH1hnU kJY=
+mail.example.com. 3600 IN A 192.0.2.3
+mail.example.com. 3600 IN RRSIG A 5 3 3600 20500101000000 20140424123615 48270 example.com. TU/fAAKwjoRwOruCjI225l8wQ4I1HabvR4nyUB86N4a9O5Y4RVVnCx7h uFGZiTW9uiaFple1393vKbTUWgzLXlorIo5YkLmiGezSVFf0nCUXRu1Y pjqi2FCS3iSPT7E3S+jyhxvhNR5Tqy/LCTnlXyy+M0RdijfAGkHcK19Y bjI=
+mail.example.com. 3600 IN AAAA 2001:db8::3
+mail.example.com. 3600 IN RRSIG AAAA 5 3 3600 20500101000000 20140424123615 48270 example.com. k3VAHqhLGLyujQPLivud2BZsDUD4jra5RJgSb0G1j9uWCmkZpjRkyn0h HsZlZYD5RnFtxBf992c3pU/+xcTZJRcW2UOJxllJ1xeCPxxUmZwI5Cse lgRSGLelCtsJKaU3K/1jkDAStJ6KI2b1c4Hcnw7Rhb6T/zzRQNz3X9vJ WWo=
+mail.example.com. 7200 IN NSEC example.com. A AAAA RRSIG NSEC
+mail.example.com. 7200 IN RRSIG NSEC 5 3 7200 20500101000000 20140424123615 48270 example.com. iULIfXN4JjJlXFsBBLgoi3q2Dfopn+J3wZbgYmw3JguUFF1rZKWNhlQH BAhOUyBk0nCFcrp1YsidG4JMKICF4DTza7xBPODcp/7pIXdm65Mjrtop yS/pfXBeROePsYKqwCVOGDPgb2PUZCqSFNeCbluDGMGC/mn5mDfCN5Gx 8HQ=
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.2 b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.2
new file mode 100644
index 0000000000000000000000000000000000000000..1284bc83801432aa89f5aeb6c947e288a7317dfd
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.2
@@ -0,0 +1,35 @@
+; File written on Thu Apr 24 15:36:15 2014
+; dnssec_signzone version 9.9.3-rpz2+rl.13214.22-P2-Ubuntu-1:9.9.3.dfsg.P2-4ubuntu1.1
+example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. 3 10800 3600 1209600 7200
+example.com. 3600 IN RRSIG SOA 7 2 3600 20500101000000 20140424123615 13445 example.com. QVisesjkna1TQg84g9jqKaiybtqeDR3KYuSQS02pIKqvFpun7Uw9Qgqd f6Lb+EqsAAAqoKTIrSjEDJokOdybR1ke3FSv4RyrTRFJjIrsjUo1M1PE NPtONcT07dhhg9tO6vlvLns+Iy6BDnZ8WlT9Uwn6XiZzSrER5hSUAIBV OTE=
+example.com. 3600 IN NS dns1.example.com.
+example.com. 3600 IN NS dns2.example.com.
+example.com. 3600 IN RRSIG NS 7 2 3600 20500101000000 20140424123615 13445 example.com. TmYITTUgzVKGWhdOv1mks3Fvr18IB367KHgx8dGUON0Q89cVp8rM6Kcm GuF/I/Y9pa9xOD/U/5BCuEFVVNRiRxFCK/ILHR0wX099zMktACkDGp3I FVtvKzK7BubrQDDTWwTdbCGUlS24SPGoWJ2yzxy8NwLxlG0WM77bezhh 5Dk=
+example.com. 3600 IN MX 10 mail.example.com.
+example.com. 3600 IN RRSIG MX 7 2 3600 20500101000000 20140424123615 13445 example.com. MNGw/1V4n3lDxijjiJcrkkZ+JdlvbcekNjrWQ4D8uxsy4H6w8YMvj6nm 2zNRixjJMgFl7dp679XfIpYxQG3nh+ck5WsdP2orHqGGGfb/m84K8I3r wv8wUXPiNnE4Ow4XryXdGIYh/BSAS5Ao0s0sBw8wmp2Xqrd0W/TwQkwF qcQ=
+example.com. 3600 IN DNSKEY 256 3 7 AwEAAd1rM20j3Y/fMAPdLuPLtDMhp987OKadgj8PihVNK7+tnTkxgSxY iRXnTGguHPmabF8iCBm9lHMyDl0L1R3OiWIhbCeMpzK/Tzb5DWBy2eYn 7zSxkfJJj09kQApVrgTlCFhB6MP3hZLm54vMyaNTJ4PKuvNSEyLFRSmx 8gIRdrMl
+example.com. 3600 IN DNSKEY 257 3 7 AwEAAey7ObNwBcGmTIvspCWlS4xmOdqzZJ5JyYJXHXyxzrQf8lxB56Xc YXvWQEBjpYC7gAHr4QFKdvnGjnbYUNBFDvktF9inm3aSxC0NiuUHMS/R jmCJaiQrHZqCprY8kngEx5RIZ69sw61lFYX3O5b1TloG3b1GlgWCsspf ff5/qStH2HXFAxVUrCx3mkCDapCnz3hHkvbtKqWYH77cLhgR2XM8y6Of ix2M0jNoPzMe81UtvfdgQ5ad32CkpwRZt5hpSnU5G2737KHgfjyGSbZC SoOrCcQVhl+CF3lLwVLejFxz5VWMd7xUueqwewSdVQtoNHVzjhbPcpV/ J2HOiPxX0sM=
+example.com. 3600 IN RRSIG DNSKEY 7 2 3600 20500101000000 20140424123615 13445 example.com. DFU5tG1lCbeHg6c4phyyqA+PIIlQf6Rf13uriDr6sp4EDaR31uE/MrZA O0CP4bI24VfKIakE0nJ4gtZNWSZQgiaOAoCk7b/EVIuVT+S9BnWM7nBB ddxguKq2WW1hZJWa6txUSwcrxFF+hatnCIfm+g8qg6cLHdoLGQSIqMvU QFE=
+example.com. 3600 IN RRSIG DNSKEY 7 2 3600 20500101000000 20140424123615 56076 example.com. mkzQXYr/sgk+PkfBJe+91TQrRsLNGdiKO6XIKb/nVSncqyjeCWhMBMcF FS/EPWkBiXf2iffVyjl1e/8Yqm5knFx2P4MK9CuUhYUC5c7kLgnkwcta WvOW+WUOgUq5B5pfGeWvveJqng7JLipHEHg0MRRSKJoRFNhuMPggIEHV /NZ1jTbCzrY+xZekZUzKfEJdTOnCPCixaPuzF4eyQDz4cNRWsn9LVEJQ 48vPdKFP25nke+NViwchZQFBn64UUieBYgvPIGU20QyvanHy6L0QVIdG LNzKlXvbBkdCeKkN/IXfYWDXNV3Z/OT41LIm6i3mVs4oi2tJbS4YXjBM +4BSvg==
+example.com. 0 IN NSEC3PARAM 1 0 10 DEADBEEF
+example.com. 0 IN RRSIG NSEC3PARAM 7 2 0 20500101000000 20140424123615 13445 example.com. bcJljy+HkAyBjEaskUocFfKJrnyCFbVDvJhov7j1RlvqR2Ez1L4CqYhG R1GWxegYZy3xg6Dez0WmX4Q/N6PSm8N7mQMOzeHJYK6WhpW5jSiG+S5v 5yXCO/fhrifNGCDRW9cs7rGCeo6HA9j2WtrPxEP6f7rjXLDFpw5H2qA0 Dvc=
+dns1.example.com. 3600 IN A 192.0.2.1
+dns1.example.com. 3600 IN RRSIG A 7 3 3600 20500101000000 20140424123615 13445 example.com. iScDKbY/Rljo6xeval4GSXy7RudSqA7EddpLmz7GDDq3gP/EYnNeAFgT eiSqibV8yXdGSHWFNtccSEa5yxpgsD0RJA7Zn2cy4PEKN9igXWFkScTs yAbBaUXI59j0odf3ugJ+1zwvu27MlS7MC+bCTsT6NcpogFolY8ncd+Yg MWg=
+dns1.example.com. 3600 IN AAAA 2001:db8::1
+dns1.example.com. 3600 IN RRSIG AAAA 7 3 3600 20500101000000 20140424123615 13445 example.com. zqfpY0fh9CWb1t5b7+tRl7VBrZTfN4B2fUkT5jmNKDlGN91KK+aYB28C iBAFzHgjAh03H1oiIePjC8XTHoodDm/JufuIa5jCvjtsj+kQ9appaoYq +FuZqjj1bh5sl57UuJplEEunxYpi5w7D1r+TOHxl00uWSOBimAxCu4q9 fWM=
+dns2.example.com. 3600 IN A 192.0.2.2
+dns2.example.com. 3600 IN RRSIG A 7 3 3600 20500101000000 20140424123615 13445 example.com. kKfg8ozccGwbXupYMr57icdnbFc496P2aR0w9U/Ys/WfbfKbvR8VUZKT qt9loHd1aW/LqqkPMXJpIhI97vPG+uQ/gb51OkcmBQxV3QwPQm7VybC+ eov+JTTGq/n+4UtMTd1aIN7IHtFsn8wuNB90obthM98HBh417csOJc+G sGs=
+dns2.example.com. 3600 IN AAAA 2001:db8::2
+dns2.example.com. 3600 IN RRSIG AAAA 7 3 3600 20500101000000 20140424123615 13445 example.com. Dk+7+1s1Qzk5XVobZ4i8LvugMC+a+4TaWNrNuunI5OPAjJy4JG43A2h2 NZaHRcK0Fr0vW7JvYn3grdiciLaY9lWhZo6ABUE3J1CvzMWWFlAe8j0G v83YwQwXqZEhYt8HivbSZepdBRYlhruY0Spgjzj/0KtxM7f/9JhFkTlX PgA=
+8A5V7AUAVJA88G1DP716TS1HLVBCNJO7.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF GR0GCFJEUNHRE7346DGPJJ5APHRUAT49 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+8A5V7AUAVJA88G1DP716TS1HLVBCNJO7.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123615 13445 example.com. Fj+2ZPQG43ExzS3eYio6jRUUQbJegtFzqpf/2PAjWDRy2+P7/58XbeGp A6EavaxUbD7zkahGo1gs/84CeACpTeTAAG8HY5hWnQi0E6QycThww/w1 YLU93Ih3al580KpgJ3+eeNL7yudsnr5+w9/XBMR5BuL6aRjCuCrOKrzY r9c=
+GR0GCFJEUNHRE7346DGPJJ5APHRUAT49.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF PBHK2DUPRJPKJABURDKKDCMLII36OM3J A AAAA RRSIG
+GR0GCFJEUNHRE7346DGPJJ5APHRUAT49.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123615 13445 example.com. L8BxH0+jf+0yzZ4IKkLeEtd+EEj5aC2afTnXHjrj6LMdfYyTcMM6gtzE fd47u60Ybe8E2GE0YC4PrQvBO9iLhB+3gs80zo+rK+ts9Mc9jwzGBqcP 5ZPjbkXjoKfHR0f0faERG6Ve7GOENon4WSh3t8k9OVlVRAhezNhPRrF4 J8c=
+mail.example.com. 3600 IN A 192.0.2.3
+mail.example.com. 3600 IN RRSIG A 7 3 3600 20500101000000 20140424123615 13445 example.com. IFAYWzpCj4rCxrtpojBAypklZe9Zvc67bNauwn9mSLvBew3UM0Nf+4c/ qJFUQLOkOnbUICRcw3sBBWl6ksVUnNcgw3cwDLnDhSeq3GnTpbTh6IxG 0szpCXuQlFw0zi67xL77iJO+jc9u/d1iBt/0KjKL7S6F/fV+Pm/Z6QF2 xTg=
+mail.example.com. 3600 IN AAAA 2001:db8::3
+mail.example.com. 3600 IN RRSIG AAAA 7 3 3600 20500101000000 20140424123615 13445 example.com. wf9usf+KohXXxGpzX10STp03gM2edf+NOa0qs9Co3uSg3udO35tH5+4K +JcYPep3bpU6bAO6xfUlE/6u/ZbewpQ3nwDeWTgTQmIho7thfacKl+Bb PHQxUXuV8N/+4ATLMiW1+Bf/6F397hzNHh8vg50uIa1h4cxh0WicGb4m Dr8=
+PBHK2DUPRJPKJABURDKKDCMLII36OM3J.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF 46BRGPLB7MVA8KQDD8P2MORSKF2OMQOH A AAAA RRSIG
+PBHK2DUPRJPKJABURDKKDCMLII36OM3J.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123615 13445 example.com. OUn0Hf+Ppo3uA+ycJpTRK8TDKwxnmwMKwuF5cMSqTH3B6b8pSCOcB2pl V9S2l5UbP6gXgLzz1wbJaQHgGD3efLk0a5D2oks5SSbNcc4lM2rpEoFU MY1Ulwh4qSDe0FskzQeRpnOn1gFoBeTyDzWvoqXV9Fdt90IzKe36y+yg esg=
+46BRGPLB7MVA8KQDD8P2MORSKF2OMQOH.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF 8A5V7AUAVJA88G1DP716TS1HLVBCNJO7 A AAAA RRSIG
+46BRGPLB7MVA8KQDD8P2MORSKF2OMQOH.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123615 13445 example.com. bghOeySB6Zw/EoDCBRE2DnpIGTj0CtrqQ24LZx6Po5aZKCOUp83AGtcR +erRYpsU1xSOlXddKMSnA9n9pdJhw7DAWyW6FfDXsZn/QFHT1PCeTepL 6uDLJ4mW8PZF0Mzi5Xx36hyVtY47n7G56NPysVALmjukKpMKQDL61ZEa T60=
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.3 b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.3
new file mode 100644
index 0000000000000000000000000000000000000000..4a35c30b71eec527756811aa287ce88e6b86aebd
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/example.com.zone.3
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 4 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/step.py b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/step.py
new file mode 100644
index 0000000000000000000000000000000000000000..5062be40689fa7a86cf0a8296512a14ed0516b09
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/step.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+'''Unsigned -> signed(NSEC) -> signed(NSEC3) -> unsigned transitions.'''
+
+def run(i):
+ i.test.start()
+
+ i.check()
+
+ i.check(1)
+
+ i.check(2)
+
+ i.check(3)
+
+ i.test.end()
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/update/example.com.zone.template b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/update/example.com.zone.template
new file mode 100644
index 0000000000000000000000000000000000000000..29c6f4b441dfa62653103283679f681492420e2e
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/update/example.com.zone.template
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster #SERIAL# 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/update/update.sh b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/update/update.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6aac48cc67cb23747a786833c882dc41e61e6790
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/07_none_nsec_nsec3_none/update/update.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+SIGN="../../../../../tools/zone_sign.sh"
+TPL="./example.com.zone.template"
+ZFIN="../example.com.zone.in"
+ZF="../example.com.zone"
+
+# 0.
+SERIAL=1
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+mv $ZFIN $ZF
+
+# 1.
+SERIAL=2
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+export BASEDIR=`mktemp -d "/tmp/zone_sign-XXX"`
+$SIGN example.com. $ZFIN nsec
+mv $ZFIN.signed $ZF.1
+
+# 2.
+SERIAL=3
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+export BASEDIR=`mktemp -d "/tmp/zone_sign-XXX"`
+$SIGN example.com. $ZFIN
+mv $ZFIN.signed $ZF.2
+
+# 3.
+SERIAL=4
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+mv $ZFIN $ZF.3
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone
new file mode 100644
index 0000000000000000000000000000000000000000..50847b6f471146984856d76e7d812c2aa46817d6
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 1 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.1 b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.1
new file mode 100644
index 0000000000000000000000000000000000000000..2552bc358c3f1663a1b8595c5f8c82c4bdae0407
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.1
@@ -0,0 +1,35 @@
+; File written on Thu Apr 24 15:36:29 2014
+; dnssec_signzone version 9.9.3-rpz2+rl.13214.22-P2-Ubuntu-1:9.9.3.dfsg.P2-4ubuntu1.1
+example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. 2 10800 3600 1209600 7200
+example.com. 3600 IN RRSIG SOA 7 2 3600 20500101000000 20140424123629 51155 example.com. PQ8cpTvs4mZGHoy2XHQLZdeiVGRTPsJqDD92hFMVJ1Inl5R2CrQatHO7 HOLtbj6aiyFWSHKqscPVsBb1zT70uOfAyu3E4VgsjNWcSKuXjLD6aZ82 qI1WLown0Q3g2TBbAoTTJn3pRlyPWTlHek/KKMrBqZvwDF7wL/R7qZ+E 36Q=
+example.com. 3600 IN NS dns1.example.com.
+example.com. 3600 IN NS dns2.example.com.
+example.com. 3600 IN RRSIG NS 7 2 3600 20500101000000 20140424123629 51155 example.com. RmlV5r9G9TEEOUBSmlXXgcRbziKFSi2jpcqGWiZ3UL3x5XfTKO9GQgFi ycmKJYRadnMbwdTWSlRZAzLmLNcMpALNE6+sxs7GNV0RhHhP+jHTh7NW 183YCPDb85U24BHS8jMS4yMFIMi9gxRiR8J+3+1pMbnsMXAyaTYwvvEH B4I=
+example.com. 3600 IN MX 10 mail.example.com.
+example.com. 3600 IN RRSIG MX 7 2 3600 20500101000000 20140424123629 51155 example.com. R24pdpnrXrEjdtBrxOoauvf9KPGJnZiAEwPmyxXcGR7592Aho+yJwucX S+mZse/n2VQeUxCWVwBx5Bzpjr/+1LfTrLKPgOM+IWKrKnaalMlzOEEZ EGlrxcEHp29uNrOLKuNfa6rhFWEO2ZwexXcRm0nAFmOvOpHD3VXvJyGH bNE=
+example.com. 3600 IN DNSKEY 256 3 7 AwEAAaMt9XXhtxM1V+SsixwTOcPeEOlvR4Ld7HA52bodbDe/yDEWpk65 O08Hjgf/UK4DGHWGVpXWp+Ch7WN/squv40mcaODf2socVwm2c0xVEgrU xI70ORPm3mIyNZxoBJCQ6Y9fECp/rzB0teoUU9r9JcwpTBXZ4I5L+9Jn ReyWSGu9
+example.com. 3600 IN DNSKEY 257 3 7 AwEAAdXa1lZM92PJxqNys90jatrmvpwmrBW4NSUJeC1aOptOFYynkatk /vns9Kw0ZbyaDrm6eLODjFAwR0Vv2BqBZQikdFk0jaQoIcyTS0kwVEvJ hSpQpIykPp9YKc2176++e5VTrLttwlJaeghnfe+e6ymn+K6fTqoyH3pp nHRMjrDQmvtIJNuXO0tnoZepgGu0GY5x+s7wzYV6e2vmK+O74eyD9m3K +EHQ3BK5fdGMgNiMNqYdjcKC9IdB8gN0vd5h3e/fJDwvNyTjn2K2vm+4 uHyo5re2QwjwoguH7Cq+8mWiu/eN40drr7R8t2Ck65jVl8i3Y1yQLj06 a0vTFWyWkKM=
+example.com. 3600 IN RRSIG DNSKEY 7 2 3600 20500101000000 20140424123629 9303 example.com. L+dEuRjOXgPEGxztW0Iw1LW+awP+giTBqYSiWRXuZ8xJVL++OBxNJVN2 MJY3edjEQXMvtahC3Qvt+P9uQU5BSSN5jvNY9IV7ROTMHXYlXefDZfiT UR+Hq7HKD28pTJyqfmBJ4Vfm+zRGRDcLQCVwv+JtqQqLtuXH4Xp6rxDc B6J9a4/mondwo1BVUHqbIh5F4TvJ4c5caASTE0IwWTXrx46+zT/Dn+Z7 ZWAj7kk18b1JkG+pHscajFZWka8MKe+g+2sIS4F/4fKqgY8HLyrKAiM9 eKD4v/I/y2q7EIsuo0xt0Pad+p+ToeOgL6xagQ99Bn9AnWwugzqbHPYk ZKD3LQ==
+example.com. 3600 IN RRSIG DNSKEY 7 2 3600 20500101000000 20140424123629 51155 example.com. c5jmhniQswa0U5H4Dbs7hzvRpW0m5oJZ+CUEdwStiluH37j+QSiiJShi 05ecYzGwpZsCfoqRBqgguPnnb49SOQ8FGtiSkBsnqMZXJro8dROo10PG 9RpGwMkq7ORZV4d+anlX6eK/cUsitH6BHsdJSb+RC7+zDecHdp5953Do u6s=
+example.com. 0 IN NSEC3PARAM 1 0 10 DEADBEEF
+example.com. 0 IN RRSIG NSEC3PARAM 7 2 0 20500101000000 20140424123629 51155 example.com. UEcOeHVD+mGkdapMDhnMeZPYlTTcTos9DGY9v/QKbtGrEalC3LbiIC2E E3BkdxoNqla5XrZ+MHkok4rGqIcJxMvPyh99p/6DPivC1B1J05M/lbAT 53LGhkEQ9lOUmT2TNwBpDesNTxsUkRa2+skHEfjeoqvAibTqTTEohJsv jUM=
+dns2.example.com. 3600 IN A 192.0.2.2
+dns2.example.com. 3600 IN RRSIG A 7 3 3600 20500101000000 20140424123629 51155 example.com. VJncJWzMCMFNX+Kfdvo5s5opBX21bLs3p8WDWjCYHqTHVILNRIf2XJ9z cgOuW0J8QCr552ComjZvMO5cTHwYQ/XF+sbPiIlsrqJfd5SOClLuJUmy fbG7KsOKkcdsTDal0ZxAJF1McBVweOs0gwruRWjjp5ray7S3Hv7D4iUw 2Ig=
+dns2.example.com. 3600 IN AAAA 2001:db8::2
+dns2.example.com. 3600 IN RRSIG AAAA 7 3 3600 20500101000000 20140424123629 51155 example.com. fNqPpG4wLL7BfuF4ApRTGFRacTNhT7aZ3E/suskuRhuqcWFCsqA+0GCM kt14N+SeisqPzmkwCVhfqvz/ODVW9i7h2vG3dwulPnK8d3IXeE/E1uJk 1stBGVEqp5S1LcFh4bwRQtifFKM/H9lfmjgcGe33JYzeVK5YIH3Kyoqm uOQ=
+dns1.example.com. 3600 IN A 192.0.2.1
+dns1.example.com. 3600 IN RRSIG A 7 3 3600 20500101000000 20140424123629 51155 example.com. PpuXCe9hPC/HcxefhCK37eu0ceVchHCDFo94PflgRi/IYFfA0Xuqj9cE RMViVb8hP6GSqNoo8EUzbp+L1o6DmhQZ8JCSUQW+anGzKdwHjYEyTrQD 7MqMGQm1ywHusGhtbvdHmqEccYN3HslRcSc7QzUOfSy2n1AC2aMeA8jn L20=
+dns1.example.com. 3600 IN AAAA 2001:db8::1
+dns1.example.com. 3600 IN RRSIG AAAA 7 3 3600 20500101000000 20140424123629 51155 example.com. X/JWig1FZWKfHMbZADpE8AUrVGdqh291hhGIzQGPsJ++S234w+y3bdHg shieg2BLfbpBeCtZIvDXQE5A89cODCTz3HJeJnkQjHGSKauGft54HPks XmA5GloJ7mOuOH10NmlvAHmP0yQIiSVElvsyP1HC5ED3Hwz6l8Fnms38 fk8=
+8A5V7AUAVJA88G1DP716TS1HLVBCNJO7.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF GR0GCFJEUNHRE7346DGPJJ5APHRUAT49 NS SOA MX RRSIG DNSKEY NSEC3PARAM
+8A5V7AUAVJA88G1DP716TS1HLVBCNJO7.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123629 51155 example.com. f4D12PiwLLSdksr0RzkNvbpk61eY7g71qOW+y25wbqWnJJHfgAj0+6mR q8sYcDmBv2uanpd+8JGuOWBC+lJerZpgaDU+2BVHAWr7Kv5f6gDYzpPd nHyVoff3b9hH3YNrKK7XnJoeMBX2a5yWhlt90nA3bJLeVKt6tVxlbbl6 ZYY=
+mail.example.com. 3600 IN A 192.0.2.3
+mail.example.com. 3600 IN RRSIG A 7 3 3600 20500101000000 20140424123629 51155 example.com. CUmYE7cqA36d3qWcLqFvwmz/3XG58ULVA4Sydbm8C+x28c5zYlf1kEi0 zyCCwZSu+aMZNyrXHoIi4ShCBbUHXEjZcGLdY3a83hQ1sI4/ILLuot0F B8sN6YA2FTHAgD+S35CnIiXiP5yAuK4S9GMHJQHtCwbavj7O1DxAv5db xdk=
+mail.example.com. 3600 IN AAAA 2001:db8::3
+mail.example.com. 3600 IN RRSIG AAAA 7 3 3600 20500101000000 20140424123629 51155 example.com. AIAeQ6mdX53Dl5Rs5h6beuHR1SA2srhQ8bR9E3zUPPjmoW6agAh4Fr6t r3ys0h5FLlHBBX5ow8PA+6dOP73UmwVNFTPhRJPlP/MXf7VliN/IZAVD /ulus1FH9W4sbjOhqGerPT9w/bIy2xms4KRr4ETKvt1tsoGZ6Fa3Lqbz n4g=
+PBHK2DUPRJPKJABURDKKDCMLII36OM3J.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF 46BRGPLB7MVA8KQDD8P2MORSKF2OMQOH A AAAA RRSIG
+PBHK2DUPRJPKJABURDKKDCMLII36OM3J.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123629 51155 example.com. BAHLHBu7+0T0ToKAzGTOe5mX8zzBvcPBLaMvEISvyBJKFT5c0YRL2iYX z/xK1aWloiPVFxYho2gUf/BNGuDLpr8oCvckGTs2Lms8qwXqlAWGmdGA LUv6tsPmna64QLUxyjTfoXYInGtQSCalvoKRgAczWxxTukXYVRPXobrb JNs=
+46BRGPLB7MVA8KQDD8P2MORSKF2OMQOH.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF 8A5V7AUAVJA88G1DP716TS1HLVBCNJO7 A AAAA RRSIG
+46BRGPLB7MVA8KQDD8P2MORSKF2OMQOH.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123629 51155 example.com. fqAEJ/ikXrfUJL/aAlxIWTcMs5J2e5gq6KrjeRt+IsSBe5pPzb5ZKTUL Mxl7xvKNk2BaDqd9UWFnUom2dPkCmCNiS1Vs8MBCdkJHM3tuWqQXiZXG 8RMKX9wNkQ5rGJMgOO+FO3dCdEfI+cZg9xLqwN3rjp5RpAv+Px+zA0lm thc=
+GR0GCFJEUNHRE7346DGPJJ5APHRUAT49.example.com. 7200 IN NSEC3 1 0 10 DEADBEEF PBHK2DUPRJPKJABURDKKDCMLII36OM3J A AAAA RRSIG
+GR0GCFJEUNHRE7346DGPJJ5APHRUAT49.example.com. 7200 IN RRSIG NSEC3 7 3 7200 20500101000000 20140424123629 51155 example.com. nI3HVCBJRMAyxxBDGEac0S73xfj4RFm2FExztpxaKoWaJZX7UV84bnc/ lkjtizO3GVdm52LdxXzYQiEMxh27SosayZ2UUROgoj0kKAcEElFoGO3e CIE8jE5x+qqlZNMVRE/b56bNaBeknGThwx4B4vfD019ARq15ZAOfEX2e HSY=
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.2 b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.2
new file mode 100644
index 0000000000000000000000000000000000000000..cb606bd639971c5a5164d83f6a3b2571972b79e4
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.2
@@ -0,0 +1,33 @@
+; File written on Thu Apr 24 15:36:29 2014
+; dnssec_signzone version 9.9.3-rpz2+rl.13214.22-P2-Ubuntu-1:9.9.3.dfsg.P2-4ubuntu1.1
+example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. 3 10800 3600 1209600 7200
+example.com. 3600 IN RRSIG SOA 5 2 3600 20500101000000 20140424123629 26931 example.com. EhKJox6H7CkP3MaazA/h8Er0MPLkag8MZ3XI2LpKoEXL1bB/veP7dkHI ZNlUU8o/VMFnuTU31lnpGK55Mjdl+bcvTyFYa+rf+WVYLf+wvq18ClN/ OjquqXCSZG1PZ8EO7ehj6pwRrtFpM42wjhU2J55U8HH4giUCCXtrawCg JwA=
+example.com. 3600 IN NS dns1.example.com.
+example.com. 3600 IN NS dns2.example.com.
+example.com. 3600 IN RRSIG NS 5 2 3600 20500101000000 20140424123629 26931 example.com. efXIzAKSk9l0M9x8XSrDrnJ4QdBkiunsfSsXgA7aZKzSk0klj3Nzs8e4 NTHmwAxLIirRiCEzQcoYeHEbrzZbxxp4k8PUE/CfhttlANF2m/amJk7a JiOwetdNAO7xULIDjzdxbuKVfqF/IzGFgDpsG662fl2fGjUjlK2gWr62 pNM=
+example.com. 3600 IN MX 10 mail.example.com.
+example.com. 3600 IN RRSIG MX 5 2 3600 20500101000000 20140424123629 26931 example.com. jPp0ZZ5ekaNEkOb9SBgTcTwqDLuTyUMnk2gzX1wCpznk99c1ydAexB3D aveKTdWzqble/w6/JIcWVgkdFLYJt1LMpZ9m0dwuAJkYB9h2ITEVdAG5 rLG5cB9hHhqIrCuIB95VaGN87cQSCUCq/2zkhff7X/uNUKJwBMHDlSQG M0g=
+example.com. 7200 IN NSEC dns1.example.com. NS SOA MX RRSIG NSEC DNSKEY
+example.com. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140424123629 26931 example.com. YYD6j7NY2ibe2AfyfMHgB/87budXM5fH3h8Erzy+G/4yQVX7AxyVRP10 EoKSSO3ydJvTjdqYLt+uAm0TnsOIs6OufT5uW+dzLGblMwubYkItvgQ1 qDEXjuZqGjlxcJ59VjuGII00WyeN4bqUjrJ5JGyY62QH3nnaoShQhYGg vps=
+example.com. 3600 IN DNSKEY 256 3 5 AwEAAceip6n1xgT5vUutYA+5Rf6xnLinPztKytdhCGHspOFd/EHN9t36 EDB0xBHBKR5WEKv8NMk6uF8QXZI7PUFzQ2gPOsnr6ezY54MRDY/tb/sv wVFLSR6yzdb+9MYofWPTaAqBNqxnhnn18aib6xvPVsebquprIfpKuUrg aFkqKygP
+example.com. 3600 IN DNSKEY 257 3 5 AwEAAbGn7Ws42gRgmNmqZoZrdMUm7bzhDyNg3IfaAwXeV+kgm2C/WBsn u8TUpZrV5fi0b0duywPFCRXZsJtSBSWDjoI5wD8HNUQ+TgTPWkkzACMm BU21RXPeoBYbRBx7TvN1TyBRfXZO7pldWv5r7ax6HQ1XQtEjIJyQsc2g lQ+YR2feVN76rGiBCeJshFJQk4MZx6pyJdMgWf9gBSp/bZ4Cezy4AtlL mSQyM6oWX/N7lVDKid2gV3V13Pot0DQSn0ZLIHRcbxDup/ztOtLKMYgN VU2AdleuORgBuxJgeJWOfS48mJexdRm4fmJu9dYZGbcWsZfpybQAlS4b 7QxhO6kel9c=
+example.com. 3600 IN RRSIG DNSKEY 5 2 3600 20500101000000 20140424123629 26931 example.com. W8CTd9ddCWSVINhz1no+A9APclnSXthsR7h2D2cMUVF6umsxtKnsvvtA wu3+3grGcnglek9qW5RzbgFYzxwpNuNxRsTZbEjx/K+lUd0+DIcp5lG9 A75l53vD52doT2IW5/iU8ioRHDGnJ3+tYL3pdkpnV7AdBjwcLqdfgn4W bB0=
+example.com. 3600 IN RRSIG DNSKEY 5 2 3600 20500101000000 20140424123629 41407 example.com. ouIQC+v1aZXrMSFigm7qYndCgnMxdEaZpOK2IanVIzO/LHQrFPED/+cC eKHCpVFM+5rntq30ZD2EN/8X0CZh51sLkwraInVjgbGQV9RH6XcPpgcB Qe0T39dJyVivmMN6/tsSJtti+Cid3ReCicgAzToAsDk2leDeudkpqYU2 cRRcUYF5vMSdlzTEUKiWpffiJFL0d1AGsAYKcJbyb1tBe6d6F3GJYu2C WHyPQ82S2iC/ySY6I9TWf63INftggE1hcmJEc6WvclVpJk2o5RCLWdDR 872EqpZIW9mUcLJOf/Yyylbydj79uCNk6m3ScHpmoDr23NyxonWns4aY qXUbMg==
+dns1.example.com. 3600 IN A 192.0.2.1
+dns1.example.com. 3600 IN RRSIG A 5 3 3600 20500101000000 20140424123629 26931 example.com. e3grqrfNoO3QfRHf8Y/968yauetK5U8dkMwU3zUNG+AHMObf+oJH0nz5 Glurzswk3nl/71ShYM4ZR10MuJ3cAyCeMQ+T8aRz8lTw87auLkKPjncr 4sQM8Jtg88/o4Ih3KkvfvTpnydC6jA5QS2eSCXS6eIcBZdp3n0R/BGMk I44=
+dns1.example.com. 3600 IN AAAA 2001:db8::1
+dns1.example.com. 3600 IN RRSIG AAAA 5 3 3600 20500101000000 20140424123629 26931 example.com. tOC096uezc6wMiCa1aEqz7maWQBknahy0RbapJHxmXRLFyY+l2C9h8nZ EsBPJjwO33xu1YgYUIl3SZm+u8VYonoiRJJfnpIqUkHerFK1j2mViOva ZEi7Du2uWq2ZmLBsiSKQucWhi9pcS1q2SsPaVBImtdY8sfMOQhG1gXSR jMs=
+dns1.example.com. 7200 IN NSEC dns2.example.com. A AAAA RRSIG NSEC
+dns1.example.com. 7200 IN RRSIG NSEC 5 3 7200 20500101000000 20140424123629 26931 example.com. KbvO11Z0jy5Tk5JJkNZuLnV3HaDTk13dWebVE7SggWHDFUTeV/G8MsFx eO+SepdVgpp3qUqjF5rNhuZqThhFLwOjZtXoWITiyKtEAWsPnLGcfA+t 1oA6pD9nAds3AkKIRIZe8LnCAh05hki54bhA1ikx2ApkwEzpp4WGAr00 mRI=
+dns2.example.com. 3600 IN A 192.0.2.2
+dns2.example.com. 3600 IN RRSIG A 5 3 3600 20500101000000 20140424123629 26931 example.com. QhzIfYDeidYQw0yvRsGVszHttZGHRT+52woPQFS4urAPQbDlTqzArt+4 qbDLgTZ7IjSyb0CRhiEm/FC9rg6LaxKKzJK84QrIR8gIDsHfvV2O6nBq 0oPfxXA807i6XclJHEn0+Pkx+hS5C63rkaK0HMwQuZ4l9Bn9OC4Gp3DB UD4=
+dns2.example.com. 3600 IN AAAA 2001:db8::2
+dns2.example.com. 3600 IN RRSIG AAAA 5 3 3600 20500101000000 20140424123629 26931 example.com. Ehzzvbg47XCUWe17Pvh60GHZ6nBK0AF+qVD0dYVN1XchOcvnnQyH1GSz S+EPaB1/CnsMGK/Oy+sk6dvFhL5BJTbU5wL5Xfge5ap5jUe9xBvDWp7W 22dsvE2vlfSeiQ3EMN5J/MSFeD6H31uhIMY6+Z2LmtgY6aY0/NiFSJIX rrc=
+dns2.example.com. 7200 IN NSEC mail.example.com. A AAAA RRSIG NSEC
+dns2.example.com. 7200 IN RRSIG NSEC 5 3 7200 20500101000000 20140424123629 26931 example.com. daI7+KJchAnoZEnW10ruxVsZrXU4oSaL/XLxp77Fi1Ic3toNnL+wcxWu gtcVm+0YEJdbzONAQPehv8uhKCflQERK0zfiju+t4Mm0dG7S/wngiHgA vHe2a9IZXDud2F7+I4id+5Q4KP02NI3F5Q7jRyRdNIvHnFgZORUN+VTR NjY=
+mail.example.com. 3600 IN A 192.0.2.3
+mail.example.com. 3600 IN RRSIG A 5 3 3600 20500101000000 20140424123629 26931 example.com. sbVd/0ZWWhAP16JwsS5ixVYZIrF2hPvZWx+PJLVQmbKqmo6w4lmCNWXp SEyJuco0wnWG5cMGayH/lqWGefgt2u2MH3VfD5eUXNO2mPUtW6QyvP6U rP1jvxiDclRr2e3lPTt8cPy4RJb3F0jNQFolOrNkMpKnzbSqC3RevC3W hgM=
+mail.example.com. 3600 IN AAAA 2001:db8::3
+mail.example.com. 3600 IN RRSIG AAAA 5 3 3600 20500101000000 20140424123629 26931 example.com. Sov5oJswCrcHjIc+X7AoRgaPtMmJsYfCnWj7B0WLmyx5Az1jfkMgiLNP YR8JbgvGwsc93HnRYEnK8STvSGLV6X9+XT/38Rvm78bIY5ZFF6mf7te3 puMX6UvAsb2UZZrov/lrw5YYNeSDnGLhHMUxXEInXMAhnoZ2bZQs8gHp xgI=
+mail.example.com. 7200 IN NSEC example.com. A AAAA RRSIG NSEC
+mail.example.com. 7200 IN RRSIG NSEC 5 3 7200 20500101000000 20140424123629 26931 example.com. n4WOxjhZFrRxV00qZE6nlQ7DR56TjJR90WzBZQ+cj/P3tVTnV/OMmlPj r5Kl0fo8iWl1sWaxA81T2+HmDqaB+qlkOQdFi2rF9iuiYs/FeiJ83RY6 7opwsmrkUHPPv5WGyw3L4wFx7cOgkWHuEF1KGtakYoTSoAGCiFjsxeEU MK4=
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.3 b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.3
new file mode 100644
index 0000000000000000000000000000000000000000..4a35c30b71eec527756811aa287ce88e6b86aebd
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/example.com.zone.3
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster 4 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/step.py b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/step.py
new file mode 100644
index 0000000000000000000000000000000000000000..e327d8e2b007e0bdaea018ba4597ca870d396eea
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/step.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+'''Unsigned -> signed(NSEC3) -> signed(NSEC) -> unsigned transitions.'''
+
+def run(i):
+ i.test.start()
+
+ i.check()
+
+ i.check(1)
+
+ i.check(2)
+
+ i.check(3)
+
+ i.test.end()
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/update/example.com.zone.template b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/update/example.com.zone.template
new file mode 100644
index 0000000000000000000000000000000000000000..29c6f4b441dfa62653103283679f681492420e2e
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/update/example.com.zone.template
@@ -0,0 +1,16 @@
+$ORIGIN example.com.
+$TTL 3600
+
+@ SOA dns1 hostmaster #SERIAL# 10800 3600 1209600 7200
+ NS dns1
+ NS dns2
+ MX 10 mail
+
+dns1 A 192.0.2.1
+ AAAA 2001:DB8::1
+
+dns2 A 192.0.2.2
+ AAAA 2001:DB8::2
+
+mail A 192.0.2.3
+ AAAA 2001:DB8::3
diff --git a/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/update/update.sh b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/update/update.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7a8495b44a237d4ea877bc7e5e5b1600b9a17f5c
--- /dev/null
+++ b/tests-extra/tests/ixfr/from_differences/08_none_nsec3_nsec_none/update/update.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+SIGN="../../../../../tools/zone_sign.sh"
+TPL="./example.com.zone.template"
+ZFIN="../example.com.zone.in"
+ZF="../example.com.zone"
+
+# 0.
+SERIAL=1
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+mv $ZFIN $ZF
+
+# 1.
+SERIAL=2
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+export BASEDIR=`mktemp -d "/tmp/zone_sign-XXX"`
+$SIGN example.com. $ZFIN
+mv $ZFIN.signed $ZF.1
+
+# 2.
+SERIAL=3
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+export BASEDIR=`mktemp -d "/tmp/zone_sign-XXX"`
+$SIGN example.com. $ZFIN nsec
+mv $ZFIN.signed $ZF.2
+
+# 3.
+SERIAL=4
+sed "s/#SERIAL#/${SERIAL}/" $TPL > $ZFIN
+mv $ZFIN $ZF.3