diff --git a/Sanity/Run-internal-BIND-test-suite/main.fmf b/Sanity/Run-internal-BIND-test-suite/main.fmf
index c9f25d5..2c1d918 100644
--- a/Sanity/Run-internal-BIND-test-suite/main.fmf
+++ b/Sanity/Run-internal-BIND-test-suite/main.fmf
@@ -5,16 +5,10 @@ description: |
 
      
 contact: Petr Sklenar <psklenar@redhat.com>
-component:
-  - bind
 test: ./runtest.sh
 framework: beakerlib
 recommend:
-  - bind
   - rpm-build
-  - bind-utils
-  - bind-pkcs11
-  - bind-pkcs11-utils
   - softhsm
   - openssl-devel
   - libtool
@@ -25,9 +19,8 @@ recommend:
   - perl(Time::HiRes)
   - perl(IO::Socket::INET6)
   - libcap-devel
-  - libidn-devel
+  - libidn2-devel
   - libxml2-devel
-  - kyua
   - openldap-devel
   - postgresql-devel
   - sqlite-devel
@@ -38,6 +31,27 @@ recommend:
   - dnf-utils
   - rng-tools
   - gcc-c++
+adjust:
+  - recommend+:
+      - bind
+      - bind-utils
+      - bind-pkcs11
+      - bind-pkcs11-utils
+    environment+:
+      PACKAGE: bind
+    when: component == bind
+  - recommend+:
+      - bind9-next
+      - bind9-next-utils
+    environment+:
+      PACKAGE: bind9-next
+    when: component == bind9-next
+  - recommend+:
+      - kyua
+    when: distro < fedora-37 or distro <= rhel-9 or distro <= centos-9
+  - recommend+:
+      - libidn-devel
+    when: distro < rhel-8 or distro < centos-8
 duration: 14h
 enabled: true
 tag:
diff --git a/Sanity/delv-smoke-test/main.fmf b/Sanity/delv-smoke-test/main.fmf
index 9a35246..2da7795 100644
--- a/Sanity/delv-smoke-test/main.fmf
+++ b/Sanity/delv-smoke-test/main.fmf
@@ -3,8 +3,6 @@ description: |
     Bug summary: [RFE] Provide delv functionality
     Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1578128
 contact: Petr Sklenar <psklenar@redhat.com>
-component:
-  - bind
 test: ./runtest.sh
 framework: beakerlib
 recommend:
@@ -20,8 +18,20 @@ tag:
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1578128
 adjust:
+  - recommend+:
+      - bind
+      - bind-utils
+    environment+:
+      PACKAGE: bind
+    when: component == bind
+  - recommend+:
+      - bind9-next
+      - bind9-next-utils
+    environment+:
+      PACKAGE: bind9-next
+    when: component == bind9-next
   - enabled: false
-    when: distro == rhel-4, rhel-5
+    when: distro == rhel-4, rhel-5, rhel-6
     continue: false
 extra-nitrate: TC#0600760
 extra-summary: /CoreOS/bind/Sanity/delv-smoke-test