diff --git a/Regression/bz1306504-lwresd-segfault-at-start-lookup/main.fmf b/Regression/bz1306504-lwresd-segfault-at-start-lookup/main.fmf
index 58aa4c6..7869622 100644
--- a/Regression/bz1306504-lwresd-segfault-at-start-lookup/main.fmf
+++ b/Regression/bz1306504-lwresd-segfault-at-start-lookup/main.fmf
@@ -12,7 +12,7 @@ require:
 - python36
 - python3
 duration: 50m
-enabled: true
+enabled: false
 tag:
 - NoRHEL4
 - NoRHEL5
@@ -21,9 +21,10 @@ tag:
 - TIPpass
 - Tier1
 tier: '1'
-relevancy: |
-    distro = rhel-4, rhel-5: False
-    distro > f33: False
+adjust:
+    enabled: true
+    when: distro ~<= fedora-33
+    because: needs BIND 9.11 lwres
 extra-summary: /CoreOS/bind/Regression/bz1306504-lwresd-segfault-at-start-lookup
 extra-task: /CoreOS/bind/Regression/bz1306504-lwresd-segfault-at-start-lookup
 extra-nitrate: TC#0529313
diff --git a/Regression/bz469441-host-command-mixed-ipv4-and-6/main.fmf b/Regression/bz469441-host-command-mixed-ipv4-and-6/main.fmf
index 4cedf3c..8cfc487 100644
--- a/Regression/bz469441-host-command-mixed-ipv4-and-6/main.fmf
+++ b/Regression/bz469441-host-command-mixed-ipv4-and-6/main.fmf
@@ -34,9 +34,14 @@ tag:
 - TIPpass
 - Tier1
 - tip_destructive_el8
+- bind-setup
 tier: '1'
 relevancy: |
     distro = rhel-6: False
+adjust:
+    enabled: false
+    when: distro > fedora-33
+    because: Does not work with bind 9.16+ yet
 extra-summary: /CoreOS/bind/Regression/bz469441-host-command-mixed-ipv4-and-6
 extra-task: /CoreOS/bind/Regression/bz469441-host-command-mixed-ipv4-and-6
 extra-nitrate: TC#0126576
diff --git a/Regression/bz533229-bind-sdb-postgresql/Makefile b/Regression/bz533229-bind-sdb-postgresql/Makefile
index a6ea393..dc24fe5 100644
--- a/Regression/bz533229-bind-sdb-postgresql/Makefile
+++ b/Regression/bz533229-bind-sdb-postgresql/Makefile
@@ -43,7 +43,7 @@ clean:
 	rm -f *~ $(BUILT_FILES)
 
 
-include /usr/share/rhts/lib/rhts-make.include
+include $(realpath /usr/share/rhts/lib/rhts-make.include)
 
 $(METADATA): Makefile
 	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
@@ -61,5 +61,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "Bug:             533229" >> $(METADATA)
 	@echo "Releases:        -RedHatEnterpriseLinux3 -RedHatEnterpriseLinux4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/Regression/bz533229-bind-sdb-postgresql/main.fmf b/Regression/bz533229-bind-sdb-postgresql/main.fmf
index 19ef427..72647ca 100644
--- a/Regression/bz533229-bind-sdb-postgresql/main.fmf
+++ b/Regression/bz533229-bind-sdb-postgresql/main.fmf
@@ -27,7 +27,7 @@ require:
 - postgresql-server
 - redhat-lsb
 duration: 15m
-enabled: true
+enabled: false
 tag:
 - NoRHEL3
 - NoRHEL4
@@ -36,9 +36,11 @@ tag:
 - TIPpass
 - Tier1
 tier: '1'
-relevancy: |
-    distro = rhel-3, rhel-4, rhel-5: False
-    arch = ppc64, ppc64le, i386: False
+adjust:
+    enabled: true
+    when: distro ~<= fedora-33
+    because: needs BIND 9.11 bind-sdb
+
 extra-summary: /CoreOS/bind/Regression/bz533229-bind-sdb-postgresql
 extra-task: /CoreOS/bind/Regression/bz533229-bind-sdb-postgresql
 extra-nitrate: TC#0126578
diff --git a/sanity/cache-server/main.fmf b/sanity/cache-server/main.fmf
index c3e2a7d..4daa5e9 100644
--- a/sanity/cache-server/main.fmf
+++ b/sanity/cache-server/main.fmf
@@ -23,7 +23,7 @@ tag:
 - broken6.3
 - fips
 - noExpectedness
-tier: '1'
+- broken
 relevancy: |
     distro = rhel-3, rhel-4, rhel-5: False
 extra-summary: /CoreOS/bind/sanity/cache-server