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..282e16b
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/perl-DateTime-Format-Pg.spec b/perl-DateTime-Format-Pg.spec
index 4dffef0..cab3d1b 100644
--- a/perl-DateTime-Format-Pg.spec
+++ b/perl-DateTime-Format-Pg.spec
@@ -25,9 +25,6 @@ BuildRequires:  perl(vars)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(warnings)
-# Optional tests only
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 %description
@@ -37,18 +34,50 @@ in order to create DateTime or DateTime::Duration objects, and it can take
 a DateTime or DateTime::Duration object and produce a string representing
 it in a format accepted by PostgreSQL.
 
+%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 DateTime-Format-Pg-%{version}
 
+# Help file to recognise the Perl scripts
+for F in t/*.t; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
+
+# Remove optional tests
+for F in t/99-pod.t t/99-pod-coverage.t; do
+    rm "$F"
+    perl -i -ne 'print $_ unless m{^\Q'"$F"'\E}' MANIFEST
+done
+
 %build
 perl Build.PL --installdirs=vendor
 ./Build
 
 %install
 ./Build install --destdir=%{buildroot} --create_packlist=0
+
+# 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
+
 %{_fixperms} %{buildroot}/*
 
 %check
+export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
 ./Build test
 
 %files
@@ -57,9 +86,13 @@ perl Build.PL --installdirs=vendor
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
 * Tue Mar 16 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.16014-1
 - 0.16014 bump
+- Package tests
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16013-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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..05aaf81
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,4 @@
+summary: Upstream tests
+component: perl-DateTime-Format-Pg
+require: perl-DateTime-Format-Pg-tests
+test: /usr/libexec/perl-DateTime-Format-Pg/test