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/.gitignore b/.gitignore
index c743385..50c650c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ convmv-1.14.tar.gz
 /convmv-2.0.tar.gz
 /convmv-2.01.tar.gz
 /convmv-2.05.tar.gz
-/convmv-2.06.tar.gz
diff --git a/convmv.spec b/convmv.spec
index 3873c7f..c406f85 100644
--- a/convmv.spec
+++ b/convmv.spec
@@ -1,7 +1,7 @@
 Summary: Convert filename encodings
 Name: convmv
-Version: 2.06
-Release: 2%{?dist}
+Version: 2.05
+Release: 16%{?dist}
 
 License: GPL-2.0-only OR GPL-3.0-only
 URL: http://j3e.de/linux/convmv
@@ -45,18 +45,6 @@ make PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 %{_mandir}/man*/*
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.06-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Mar 24 2025 Parag Nemade <pnemade AT redhat DOT com> - 2.06-1
-- Update to 2.06 version (#2348686)
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.05-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.05-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Mon May 27 2024 Parag Nemade <pnemade AT redhat DOT com> - 2.05-16
 - Correct the SPDX license expression
 
diff --git a/plans/convmv.fmf b/plans/convmv.fmf
deleted file mode 100644
index c1627f9..0000000
--- a/plans/convmv.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/sources b/sources
index 7038889..4756c98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (convmv-2.06.tar.gz) = a93acb0aa019ec468ec263947c3e0158c51b1b24885e77f62861555c8e80aaa6867eb42045040d09c83488460db0d2edea7327a5354afded2ab02caf7f54204d
+SHA512 (convmv-2.05.tar.gz) = 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index d27d659..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-test: ./runtests.sh
-duration: 10m
-framework: beakerlib
-require:
-  - convmv
-  - perl
-  - make
-  - rpm-build
diff --git a/tests/runtests.sh b/tests/runtests.sh
deleted file mode 100755
index 7277ee4..0000000
--- a/tests/runtests.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-NAME=convmv
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${NAME}
-        rlShowPackageVersion ${NAME}
-        rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
-        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
-        rlRun "pushd $tmp"
-        rlFetchSrcForInstalled "${NAME}"
-        rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
-        rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
-        rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
-        if [ -d BUILD/${NAME}-${VERSION}-build ]; then
-            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
-        else
-            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
-        fi
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "set -o pipefail"
-        rlRun "make V=1 test"
-        rlRun "retval=$?"
-        rlRun "echo $retval"
-        rlRun "popd" 0
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $tmp" 0 "Remove tmp directory"
-    rlPhaseEnd
-rlJournalEnd
-
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
new file mode 100644
index 0000000..ecd41b5
--- /dev/null
+++ b/tests/smoke/runtest.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+cd ../source
+make V=1 test
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..cc62a54
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,17 @@
+---
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-source
+ 
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-basic
+    tests:
+    - smoke
+    required_packages:
+    - perl
+    - make