diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index adb0c81..f2fa8a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /generators-1.09.tar.gz
 /generators-1.10.tar.gz
 /generators-1.11.tar.gz
+/generators-1.13.tar.gz
diff --git a/gating.yaml b/gating.yaml
index c190bde..648918d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,4 +3,4 @@ product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/perl-generators.spec b/perl-generators.spec
index 1a21c4b..bef65f9 100644
--- a/perl-generators.spec
+++ b/perl-generators.spec
@@ -1,6 +1,6 @@
 Name:           perl-generators
-Version:        1.11
-Release:        12%{?dist}
+Version:        1.13
+Release:        1%{?dist}
 Summary:        RPM Perl dependencies generators
 License:        GPL+
 URL:            http://jplesnik.fedorapeople.org/generators
@@ -13,6 +13,7 @@ BuildRequires:  make
 BuildRequires:  perl-generators
 %endif
 BuildRequires:  perl-interpreter >= 4:5.22.0-351
+BuildRequires:  perl(Config)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(File::Copy)
 BuildRequires:  perl(File::Find)
@@ -29,7 +30,6 @@ BuildRequires:  perl(lib)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Simple)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl-interpreter >= 4:5.22.0-351
 # Per Perl packaging guidelines, build-requiring perl-generators should
 # deliver Perl macros
@@ -44,12 +44,39 @@ Recommends:     perl(version)
 # The generators and attribute files were split from rpm-build
 Conflicts:      rpm-build < 4.11.2-15
 
+# Filter modules bundled for tests
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(PerlNS\\)
+
 %description
 This package provides RPM Perl dependencies generators which are used for
 getting provides and requires from Perl binaries and modules.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+%if %{defined perl_bootstrap}
+# Supply run-time dependencies manually when perl-generators is not available
+Requires:       perl(Exporter)
+Requires:       perl(lib)
+Requires:       perl(strict)
+Requires:       perl(Test::More)
+Requires:       perl(Test::Simple)
+Requires:       perl(warnings)
+%endif
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n generators-%{version}
+# Help generators to recognize Perl scripts
+for F in t/*.t; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=%{_rpmconfigdir} \
@@ -58,20 +85,37 @@ perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=%{_rpmconfigdir} \
 
 %install
 %{make_install}
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} %{buildroot}/*
 
 mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs/
 install -p -m 644 fileattrs/* '%{buildroot}%{_rpmconfigdir}/fileattrs'
 
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+perl -i -pe "s{bin/perl}{%{_rpmconfigdir}/perl}" %{buildroot}%{_libexecdir}/%{name}/t/lib/PerlNS.pm
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+
 %check
 make test
 
 %files
 %doc Changes TODO
-%{_rpmconfigdir}/perl.*
+%{_rpmconfigdir}/*
 %{_rpmconfigdir}/fileattrs/perl*.attr
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
+* Thu Nov 14 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.13-1
+- Resolves: RHEL-5537 - 1.13 bump
+- Package tests
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.11-12
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/plans/internal.fmf b/plans/internal.fmf
new file mode 100644
index 0000000..465a040
--- /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-generators
+execute:
+    how: tmt
diff --git a/plans/sanity.fmf b/plans/sanity.fmf
new file mode 100644
index 0000000..a72ded4
--- /dev/null
+++ b/plans/sanity.fmf
@@ -0,0 +1,5 @@
+summary: Sanity tests
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/sources b/sources
index 2aa6d3c..ee8db12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (generators-1.11.tar.gz) = e232fc593c0ef9fed0b045826beac0597117731578ba14321f0f4a05df8d5dec261d1e0131c866bef762d0e48d4d4ef102c409d9cb8671575ebcc968301a5852
+SHA512 (generators-1.13.tar.gz) = 93e55a73d9baedd31a1a2eacf22d05655858474c2866c89b04128c3de28bdd5e091d1752f450c9b487f0ceea6c7e4258daf6fcf11801228e892864a3be709b91
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
new file mode 100644
index 0000000..ba513fe
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,11 @@
+summary: Upstream tests
+component: perl-generators
+require: perl-generators-tests
+test: /usr/libexec/perl-generators/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-9 or distro < centos-stream-9
+    continue: false