diff --git a/Sanity/Run-internal-BIND-test-suite/main.fmf b/Sanity/Run-internal-BIND-test-suite/main.fmf
index 61ba6dd..abb2e09 100644
--- a/Sanity/Run-internal-BIND-test-suite/main.fmf
+++ b/Sanity/Run-internal-BIND-test-suite/main.fmf
@@ -39,7 +39,13 @@ adjust:
       - bind-pkcs11-utils
     environment+:
       PACKAGE: bind
-    when: component == 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
diff --git a/Sanity/Run-internal-BIND-test-suite/runtest.sh b/Sanity/Run-internal-BIND-test-suite/runtest.sh
index 59f830e..7277646 100755
--- a/Sanity/Run-internal-BIND-test-suite/runtest.sh
+++ b/Sanity/Run-internal-BIND-test-suite/runtest.sh
@@ -40,10 +40,6 @@
 : ${PACKAGE:=bind}
 USER="user$RANDOM"
 CORES=1
-for PACKAGE in $PACKAGE bind bind97 bind9.16 bind9-next
-do
-	rpm -q "$PACKAGE" && break
-done
 
 rlJournalStart
     rlPhaseStartSetup
diff --git a/Sanity/geoip-support/main.fmf b/Sanity/geoip-support/main.fmf
index 11f656f..14c96b8 100644
--- a/Sanity/geoip-support/main.fmf
+++ b/Sanity/geoip-support/main.fmf
@@ -22,10 +22,20 @@ adjust:
   - recommend+:
       - bind
       - bind-utils
-    when: component == bind
+    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
   - enabled: false
     when: distro < rhel-8
diff --git a/Sanity/json-support/main.fmf b/Sanity/json-support/main.fmf
index 736e6cb..3d7db7c 100644
--- a/Sanity/json-support/main.fmf
+++ b/Sanity/json-support/main.fmf
@@ -4,14 +4,29 @@ description: |
     Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1899257
 contact:
 - Petr Mensik <pemensik@redhat.com>
-component:
-- bind
 test: ./runtest.sh
 framework: beakerlib
 recommend:
-- bind
-- bind-utils
-- python3
+  - python3
+adjust:
+  - require+:
+      - bind
+      - bind-utils
+    environment+:
+      PACKAGE: bind
+    when: component is not defined or component == bind
+  - require+:
+      - bind9-next
+      - bind9-next-utils
+    environment+:
+      PACKAGE: bind9-next
+    when: component == bind9-next
+  - require+:
+      - bind9.16
+      - bind9.16-utils
+    environment+:
+      PACKAGE: bind9.16
+    when: component == bind9.16
 duration: 5m
 extra-summary: /CoreOS/bind/Sanity/json-support
 extra-task: /CoreOS/bind/Sanity/json-support
diff --git a/Sanity/json-support/runtest.sh b/Sanity/json-support/runtest.sh
index e874ffe..64b4d28 100755
--- a/Sanity/json-support/runtest.sh
+++ b/Sanity/json-support/runtest.sh
@@ -28,7 +28,7 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
-PACKAGE="bind"
+: ${PACKAGE:="bind"}
 
 rlJournalStart
     rlPhaseStartSetup
diff --git a/Sanity/named-checkzone/main.fmf b/Sanity/named-checkzone/main.fmf
index 47caf6d..37abc7f 100644
--- a/Sanity/named-checkzone/main.fmf
+++ b/Sanity/named-checkzone/main.fmf
@@ -5,9 +5,6 @@ component:
   - bind
 test: ./runtest.sh
 framework: beakerlib
-recommend:
-  - bind
-  - bind-utils
 duration: 5m
 enabled: true
 tag:
@@ -20,6 +17,24 @@ adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5
     continue: false
+  - require+:
+      - bind
+      - bind-utils
+    environment+:
+      PACKAGE: bind
+    when: component is not defined or component == bind
+  - require+:
+      - bind9-next
+      - bind9-next-utils
+    environment+:
+      PACKAGE: bind9-next
+    when: component == bind9-next
+  - require+:
+      - bind9.16
+      - bind9.16-utils
+    environment+:
+      PACKAGE: bind9.16
+    when: component == bind9.16
 extra-nitrate: TC#0500008
 extra-summary: /CoreOS/bind/Sanity/named-checkzone
 extra-task: /CoreOS/bind/Sanity/named-checkzone
diff --git a/Sanity/named-checkzone/runtest.sh b/Sanity/named-checkzone/runtest.sh
index a4a1856..3e2b018 100755
--- a/Sanity/named-checkzone/runtest.sh
+++ b/Sanity/named-checkzone/runtest.sh
@@ -28,7 +28,7 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
-PACKAGE="bind"
+: ${PACKAGE:="bind"}
 
 rlJournalStart
     rlPhaseStartSetup