diff --git a/gating.yaml b/gating.yaml
index 3b56a2d..277bfe1 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -14,3 +14,10 @@ decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/perl-Pod-Usage.spec b/perl-Pod-Usage.spec
index 3a9d5de..69454c8 100644
--- a/perl-Pod-Usage.spec
+++ b/perl-Pod-Usage.spec
@@ -2,7 +2,7 @@ Name:           perl-Pod-Usage
 # Compete with perl.spec's epoch
 Epoch:          4
 Version:        2.03
-Release:        503%{?dist}
+Release:        504%{?dist}
 Summary:        Print a usage message from embedded POD documentation
 # License clarification CPAN RT#102529
 License:        GPL-1.0-or-later OR Artistic-1.0-Perl
@@ -51,6 +51,7 @@ Requires:       perl(Pod::Text) >= 4
 
 # Remove under-specified dependencies
 %global __requires_exclude %{?__requires_exclude|%{__requires_exclude}|}^perl\\(File::Spec\\)$
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
 
 %description
 pod2usage will print a usage message for the invoking script (using its
@@ -130,6 +131,10 @@ make test
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed May 15 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4:2.03-504
+- Filter provides from sub-package tests
+- Resolves: RHEL-36310
+
 * Wed Feb 07 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4:2.03-503
 - Package tests
 
diff --git a/tests/RHEL-36310-Filter-provides-from-tests.fmf b/tests/RHEL-36310-Filter-provides-from-tests.fmf
new file mode 100644
index 0000000..8020614
--- /dev/null
+++ b/tests/RHEL-36310-Filter-provides-from-tests.fmf
@@ -0,0 +1,18 @@
+summary: Verify that sub-package tests doesn't provides perl(Pod::Usage)
+contact: Jitka Plesnikova <jplesnik@redhat.com>
+component:
+  - perl-Pod-Usage
+require:
+  - perl-Pod-Usage-tests
+test: if `rpm -qP perl-Pod-Usage-tests | grep -q 'perl(Pod::Usage)'` ; then echo 1; else echo 0; fi
+framework: shell
+enabled: true
+tag:
+  - rhel-buildroot
+  - TestCaseCopy
+  - Tier1
+tier: '1'
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index 10f72b3..e5895c3 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -1,4 +1,15 @@
 summary: Upstream tests
+contact: Jitka Plesnikova <jplesnik@redhat.com>
 component: perl-Pod-Usage
 require: perl-Pod-Usage-tests
 test: /usr/libexec/perl-Pod-Usage/test
+enabled: true
+tag:
+  - rhel-buildroot
+  - TestCaseCopy
+  - Tier1
+tier: '1'
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false