diff --git a/gating.yaml b/gating.yaml
index 282e16b..1f363c2 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,18 @@
+# Fedora
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_stable
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+# RHEL
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/perl-Sub-Quote.spec b/perl-Sub-Quote.spec
index 42eef3a..3097378 100644
--- a/perl-Sub-Quote.spec
+++ b/perl-Sub-Quote.spec
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Quote
 Version:        2.006008
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Efficient generation of subroutines via string eval
 License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 URL:            https://metacpan.org/release/Sub-Quote
@@ -38,6 +38,7 @@ Requires:       perl(XString) >= 0.003
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(ErrorLocation\\)
 %global __requires_exclude %{__requires_exclude}|^perl\\(InlineModule\\)
+%global __requires_exclude %{__requires_exclude}|^perl\\(Sub::Name\\)
 %global __requires_exclude %{__requires_exclude}|^perl\\(ThreadsCheck\\)
 
 %description
@@ -92,6 +93,9 @@ make test
 %{_libexecdir}/%{name}
 
 %changelog
+* Fri Jun 28 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2.006008-6
+- Filter perl(Sub::Name) from tests
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.006008-5
 - Bump release for June 2024 mass rebuild
 
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index f8d5196..b83d12f 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -2,3 +2,10 @@ summary: Upstream tests
 component: perl-Sub-Quote
 require: perl-Sub-Quote-tests
 test: /usr/libexec/perl-Sub-Quote/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false