diff --git a/gating.yaml b/gating.yaml
index 277bfe1..a5f7f45 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -15,6 +15,7 @@ subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
 
+# RHEL
 --- !Policy
 product_versions:
   - rhel-*
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index 263b192..3f92244 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -2,3 +2,10 @@ summary: Upstream tests
 component: perl-DBD-MariaDB
 require: perl-DBD-MariaDB-tests
 test: /usr/libexec/perl-DBD-MariaDB/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false