diff --git a/gating.yaml b/gating.yaml
index 282e16b..24a0379 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,3 +5,11 @@ decision_context: 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-Archive-Zip.spec b/perl-Archive-Zip.spec
index 8f1a79d..d58c339 100644
--- a/perl-Archive-Zip.spec
+++ b/perl-Archive-Zip.spec
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Zip
 Version:        1.68
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Perl library for accessing Zip archives
 # lib/Archive/Zip/Member.pm:    (GPL-1.0-or-later OR Artistic-1.0-Perl) and Info-ZIP
 #                               (The _mapPermissionsToUnix() comments are
@@ -56,6 +56,7 @@ Requires:       perl(File::Spec) >= 0.80
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(File::Spec\\)$
 # Filter modules bundled for tests
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
+%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}^%{_libexecdir}/%{name}/examples
 %global __requires_exclude %{__requires_exclude}|^perl\\(common\\)
 
 %description
@@ -131,6 +132,9 @@ make test
 %{_libexecdir}/%{name}
 
 %changelog
+* Mon Jul 08 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.68-16
+- Update dependencies of sub-package tests
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.68-15
 - Bump release for June 2024 mass rebuild
 
diff --git a/plans/internal.fmf b/plans/internal.fmf
new file mode 100644
index 0000000..12ab9ff
--- /dev/null
+++ b/plans/internal.fmf
@@ -0,0 +1,12 @@
+summary: Private (RHEL) beakerlib tests
+enabled: false
+adjust:
+  - when: distro == rhel
+    enabled: true
+    because: private tests are accesible only within rhel pipline
+discover:
+  - name: rhel
+    how: fmf
+    url: https://pkgs.devel.redhat.com/git/tests/perl-Archive-Zip
+execute:
+    how: tmt
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index 1b77aab..7bd5454 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -2,4 +2,10 @@ summary: Upstream tests
 component: perl-Archive-Zip
 require: perl-Archive-Zip-tests
 test: /usr/libexec/perl-Archive-Zip/test
-
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false