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/.fmf/version b/tests/.fmf/version
similarity index 100%
rename from .fmf/version
rename to tests/.fmf/version
diff --git a/tests/Sanity/basic-sanity/main.fmf b/tests/Sanity/basic-sanity/main.fmf
index e87514e..ad4c0fa 100644
--- a/tests/Sanity/basic-sanity/main.fmf
+++ b/tests/Sanity/basic-sanity/main.fmf
@@ -11,6 +11,6 @@ require:
   - nss-tools
   - expect
   - tcllib
-framework: beakerlib
 test: ./runtest.sh
 duration: 10m
+tier: 1
diff --git a/tests/Sanity/basic-sanity/runtest.sh b/tests/Sanity/basic-sanity/runtest.sh
index 23f72d5..5ea92c8 100755
--- a/tests/Sanity/basic-sanity/runtest.sh
+++ b/tests/Sanity/basic-sanity/runtest.sh
@@ -28,6 +28,7 @@
 _TESTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 
 # Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 # Include utils
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..c113f70
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,14 @@
+---
+- hosts: localhost
+  roles:
+    - role: standard-test-beakerlib
+      tags:
+        - classic
+        - container
+      fmf_filter: "tier: 1"
+      required_packages:
+        - volume_key
+        - cryptsetup
+        - expect
+        - tcllib
+        - nss-tools
diff --git a/volume_key.spec b/volume_key.spec
index 1e7129f..f22f2b9 100644
--- a/volume_key.spec
+++ b/volume_key.spec
@@ -32,7 +32,7 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.3.12
-Release: 29%{?dist}
+Release: 20%{?dist}
 License: GPL-2.0-only AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later)
 URL: https://pagure.io/%{name}/
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -48,8 +48,7 @@ BuildRequires: autoconf, automake, libtool
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: cryptsetup-devel, gettext-devel, glib2-devel, /usr/bin/gpg2
-BuildRequires: gpgme-devel, libblkid-devel, nss-devel
-BuildRequires: python3-devel, python3-setuptools
+BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python3-devel
 %if 0%{?drop_python2} < 1
 BuildRequires: python2-devel
 %endif
@@ -120,8 +119,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1
+%patch0 -p1
+%patch1 -p1
 autoreconf -fiv
 
 %build
@@ -173,33 +172,6 @@ exit 1; \
 %endif
 
 %changelog
-* Tue Nov 11 2025 Michal Hlavinka <mhlavink@redhat.com> - 0.3.12-29
-- rebuild for gpgme 2.0
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.3.12-28
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.3.12-27
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 0.3.12-25
-- Rebuilt for Python 3.14
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.3.12-22
-- Rebuilt for Python 3.13
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild