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/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..1608530
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+# RHEL
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/perl-Test-Simple.spec b/perl-Test-Simple.spec
index f7aac3e..36fec74 100644
--- a/perl-Test-Simple.spec
+++ b/perl-Test-Simple.spec
@@ -13,7 +13,7 @@ Name:           perl-Test-Simple
 Summary:        Basic utilities for writing tests
 Epoch:          3
 Version:        1.302198
-Release:        4%{?dist}
+Release:        5%{?dist}
 # CC0-1.0: lib/ok.pm
 # Public Domain: lib/Test/Tutorial.pod
 # GPL-1.0-or-later OR Artistic-1.0-Perl: the rest of the distribution
@@ -93,14 +93,35 @@ Requires:       perl(Term::Table)
 
 %{?perl_default_filter}
 
+# Remove private test modules
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Dev::Null|MyOverload|Test::Builder::NoOutput|Test::Simple::Catch|TieOut|main::HBase|main::HBase::Wrapped\\)$
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Dev::Null|Dummy|MyTest|NoExporter|Overloaded|Overloaded::(Compare|Ify|Partial)|SigDie|SkipAll|SmallTest|Test::Builder::NoOutput|Test::Builder::NoOutput::Tee|Test::Simple::Catch|TieOut\\)$
+%if %{without perl_Test_Simple_enables_optional_test}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Test::Script|Test::Class\\)$
+%endif
+
 %description
 This package provides the bulk of the core testing facilities. For more
 information, see perldoc for Test::Simple, Test::More, etc.
 
 This package is the CPAN component of the dual-lifed core package Test-Simple.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n Test-Simple-%{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 NO_PERLLOCAL=1 NO_PACKLIST=1
@@ -109,6 +130,19 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PERLLOCAL=1 NO_PACKLIST=1
 %install
 %{make_install}
 %{_fixperms} -c %{buildroot}
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+# Remove author tests
+rm -f %{buildroot}%{_libexecdir}/%{name}/t/00compile.t
+# Remove tests, which are not compatible with running outside of t/ directory
+rm -f %{buildroot}%{_libexecdir}/%{name}/t/Legacy/More.t
+rm -f %{buildroot}%{_libexecdir}/%{name}/t/Legacy/fail-more.t
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -r -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
 
 %check
 make test %{!?perl_bootstrap:AUTHOR_TESTING=1}
@@ -200,7 +234,13 @@ make test %{!?perl_bootstrap:AUTHOR_TESTING=1}
 %{_mandir}/man3/Test2::Util::HashBase.3*
 %{_mandir}/man3/Test2::Util::Trace.3*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
+* Thu Jul 11 2024 Michal Josef Špaček <mspacek@redhat.com> - 3:1.302198-5
+- Package tests
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3:1.302198-4
 - Bump release for June 2024 mass rebuild
 
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/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
new file mode 100644
index 0000000..173bcb2
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,12 @@
+summary: Upstream tests
+contact: Michal Josef Spacek <mspacek@redhat.com>
+component: perl-Test-Simple
+require: perl-Test-Simple-tests
+test: /usr/libexec/perl-Test-Simple/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false