diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/omping.spec b/omping.spec
index 541936c..b9c225f 100644
--- a/omping.spec
+++ b/omping.spec
@@ -1,6 +1,6 @@
 Name: omping
 Version: 0.0.4
-Release: 35%{?dist}
+Release: 25%{?dist}
 Summary: Utility to test IP multicast functionality
 License: ISC
 URL: https://github.com/jfriesse/omping
@@ -8,14 +8,13 @@ Source0: https://github.com/jfriesse/%{name}/releases/download/%{version}/%{name
 
 BuildRequires: gcc
 BuildRequires: make
-BuildRequires: git
 
 %description
 Omping (Open Multicast Ping) is tool to test IP multicast functionality
 primarily in local network.
 
 %prep
-%autosetup -S git_am
+%setup -q
 
 %build
 %set_build_flags
@@ -31,36 +30,6 @@ primarily in local network.
 %{_mandir}/man8/*
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 0.0.4-29
-- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..e6c79fd
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,3 @@
+# Ignore tests runs/artefacts.
+artifacts/**
+**/*.retry
diff --git a/tests/plan.fmf b/tests/plan.fmf
deleted file mode 100644
index 86ef9b3..0000000
--- a/tests/plan.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Run all smoke tests
-discover:
-    how: fmf
-execute:
-    how: tmt
-prepare:
-    how: install
-    package:
-        - iproute
-        - omping
diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf
deleted file mode 100644
index c431594..0000000
--- a/tests/smoke/main.fmf
+++ /dev/null
@@ -1,2 +0,0 @@
-summary: Basic smoke test
-test: ./runtest.sh
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
old mode 100755
new mode 100644
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..65995c8
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,10 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - smoke
+    required_packages:
+    - iproute
+    - omping