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/findutils.spec b/findutils.spec
index 9af5035..e349bf0 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.10.0
-Release: 6%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPL-3.0-or-later
 URL: https://www.gnu.org/software/findutils/
@@ -118,9 +118,6 @@ rm -f %{buildroot}%{_infodir}/dir
 %{_infodir}/find-maint.info.*
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.10.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.10.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
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/tests/smoke/main.fmf b/tests/smoke/main.fmf
deleted file mode 100644
index 7def608..0000000
--- a/tests/smoke/main.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: Smoke test for find and xargs.
-description: ''
-contact: Branislav Nater <bnater@redhat.com>
-component:
-  - findutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - findutils
-duration: 5m
-extra-summary: /CoreOS/findutils/Sanity/smoke
-extra-task: /CoreOS/findutils/Sanity/smoke
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
index 4ce0502..438548d 100755
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@@ -27,7 +27,8 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
+. /usr/bin/rhts-environment.sh || exit 1
+. /usr/lib/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="findutils"
 
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..636db22
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,14 @@
+---
+# Tests which will run in all contexts
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    - atomic
+    tests:
+    - smoke
+    - xautofs
+    required_packages:
+    - autofs       # autofs required for xautofs test
diff --git a/tests/xautofs/main.fmf b/tests/xautofs/main.fmf
deleted file mode 100644
index 0cedf13..0000000
--- a/tests/xautofs/main.fmf
+++ /dev/null
@@ -1,21 +0,0 @@
-summary: Check xautofs option
-description: |
-    Bug summary: [RFE] Modify find to be able to skip direct mapped autofs mounts
-    Bugzilla link: None
-
-    Check that the new -xautofs option works as expected: make sure
-    find does not descend into directories on autofs filesystems.
-contact: Branislav Nater <bnater@redhat.com>
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=485672
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=529391
-component:
-  - findutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - autofs
-  - findutils
-duration: 10m
-extra-summary: /CoreOS/findutils/Sanity/options/xautofs
-extra-task: /CoreOS/findutils/Sanity/options/xautofs
diff --git a/tests/xautofs/runtest.sh b/tests/xautofs/runtest.sh
index 0a13995..99a0988 100755
--- a/tests/xautofs/runtest.sh
+++ b/tests/xautofs/runtest.sh
@@ -27,7 +27,8 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
+. /usr/bin/rhts-environment.sh
+. /usr/share/rhts-library/rhtslib.sh
 
 PACKAGE="findutils"