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-Error.spec b/perl-Error.spec
index c4ac8a7..f816d2d 100644
--- a/perl-Error.spec
+++ b/perl-Error.spec
@@ -1,7 +1,7 @@
 Name:           perl-Error
 Epoch:          1
 Version:        0.17029
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Error/exception handling in an OO-ish way
 License:        (GPL-1.0-or-later OR Artistic-1.0-Perl) AND X11
 URL:            https://metacpan.org/release/Error
@@ -37,14 +37,32 @@ Requires:       perl(Carp)
 %global __provides_exclude_from ^%{_docdir}
 %global __requires_exclude_from ^%{_docdir}
 
+# Remove private test modules
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(MyDie\\)$
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(MyDie\\)$
+
 %description
 The Error package provides two interfaces. Firstly Error provides a
 procedural interface to exception handling. Secondly Error is a base class
 for errors/exceptions that can either be thrown, for subsequent catch, or
 can simply be recorded.
 
+%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 Error-%{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
@@ -54,6 +72,14 @@ make %{?_smp_mflags}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -delete
 %{_fixperms} -c %{buildroot}
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+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
@@ -68,7 +94,13 @@ make test
 %{perl_vendorlib}/Error/
 %{_mandir}/man3/Error::Simple.3*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
+* Sat Jul 13 2024 Michal Josef Špaček <mspacek@redhat.com> - 1:0.17029-17
+- Package tests
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:0.17029-16
 - 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..a3b7c9a
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,12 @@
+summary: Upstream tests
+contact: Michal Josef Spacek <mspacek@redhat.com>
+component: perl-Error
+require: perl-Error-tests
+test: /usr/libexec/perl-Error/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false