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/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..8db150f
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,5 @@
+summary: Upstream tests
+component: unpaper
+require: unpaper-tests
+test: /usr/libexec/unpaper/test
+duration: 12m
diff --git a/unpaper.spec b/unpaper.spec
index ac8ea64..8d43f35 100644
--- a/unpaper.spec
+++ b/unpaper.spec
@@ -106,7 +106,6 @@ cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
 export TEST_IMGSRC_DIR=tests/source_images
 export TEST_GOLDEN_DIR=tests/golden_images
 export TEST_UNPAPER_BINARY=%{_bindir}/unpaper
-# 391 seconds single-threaded
 cd %{_libexecdir}/%{name} && exec pytest -v -n "$(getconf _NPROCESSORS_ONLN)" tests/unpaper_tests.py
 EOF
 chmod +x %{buildroot}%{_libexecdir}/%{name}/test