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/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index c1627f9..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/teckit.spec b/teckit.spec
index d67dc82..d285f41 100644
--- a/teckit.spec
+++ b/teckit.spec
@@ -1,6 +1,6 @@
 Name:           teckit
 Version:        2.5.12
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        Encoding conversion library and mapping compiler
 # COPYING:                      links to license/LICENSING.txt
 # license/License_CPLv05.txt:   CPL-1.0 text, "0.5" version in the license
@@ -134,26 +134,11 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/pkgconfig/teckit.pc
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Mon Aug 28 2023 Petr Pisar <ppisar@redhat.com> - 2.5.12-1
 - 2.5.12 bump
 - Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND
   (LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0)"
 
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.11-1
 - 2.5.11 bump
 
diff --git a/tests/smoke-functionality/Makefile b/tests/smoke-functionality/Makefile
index 9b27478..5670168 100644
--- a/tests/smoke-functionality/Makefile
+++ b/tests/smoke-functionality/Makefile
@@ -56,7 +56,7 @@ $(METADATA): Makefile
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RunFor:          teckit" >> $(METADATA)
-	@echo "Requires:        teckit bash coreutils man-db" >> $(METADATA)
+	@echo "Requires:        teckit" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         LGPLv2+ or CPL" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
diff --git a/tests/smoke-functionality/main.fmf b/tests/smoke-functionality/main.fmf
deleted file mode 100644
index 9514e77..0000000
--- a/tests/smoke-functionality/main.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
-summary: tests basic functionality
-contact: Than Ngo <than@redhat.com>
-component:
-  - teckit
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - bash
-  - coreutils
-  - man-db
-  - teckit
-duration: 5m
-extra-summary: /CoreOS/teckit/smoke-functionality
-extra-task: /CoreOS/teckit/smoke-functionality
diff --git a/tests/smoke-functionality/runtest.sh b/tests/smoke-functionality/runtest.sh
index 8a61228..804e753 100755
--- a/tests/smoke-functionality/runtest.sh
+++ b/tests/smoke-functionality/runtest.sh
@@ -27,6 +27,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="teckit"
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..c01163c
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,11 @@
+---
+# Run tests in all contexts
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-beakerlib
+    tests:
+    - smoke-functionality
+    required_packages:
+    - teckit