diff --git a/Sanity/caching-forwarder-dnssec/main.fmf b/Sanity/caching-forwarder-dnssec/main.fmf
index d84d444..06fdab6 100644
--- a/Sanity/caching-forwarder-dnssec/main.fmf
+++ b/Sanity/caching-forwarder-dnssec/main.fmf
@@ -4,8 +4,29 @@ framework: beakerlib
 description: |
   Configures named as a caching forwarder. Keep dnssec-validation enabled and try to
   workaround for buggy nameservers provided from the network.
-require+:
-  - bind
+
+  Test signed zones are validated and include ad bit. Check unsigned zones are
+  missing ad bit in responses. Requires security-aware DNS servers to be supplied by
+  the network.
 recommend+:
-  - bind-utils
   - sed
+  - awk
+adjust:
+  - recommend+:
+      - bind
+      - bind-utils
+    environment+:
+      PACKAGE: bind
+    when: component is not defined or component == bind
+  - recommend+:
+      - bind9.16
+      - bind9.16-utils
+    environment+:
+      PACKAGE: bind9.16
+    when: component == bind9.16
+  - recommend+:
+      - bind9-next
+      - bind9-next-utils
+    environment+:
+      PACKAGE: bind9-next
+    when: component == bind9-next
diff --git a/Sanity/caching-forwarder-dnssec/test.sh b/Sanity/caching-forwarder-dnssec/test.sh
index 0db5e87..760b592 100755
--- a/Sanity/caching-forwarder-dnssec/test.sh
+++ b/Sanity/caching-forwarder-dnssec/test.sh
@@ -158,6 +158,8 @@ rlJournalStart
         rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
         rlRun "pushd $tmp"
         rlRun "set -o pipefail"
+	rlRun "named -V"
+	rlRun "dig -v"
 	rlRun "SECURE_SERVERS=\"$(dnssec_servers)\"" || rlFail "No secure servers obtained"
 	rlFileBackup --missing-ok /etc/named/forwarders.conf
 	rlFileBackup /etc/named.conf