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/gating.yaml b/gating.yaml
deleted file mode 100644
index 282e16b..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/m4.spec b/m4.spec
index 7a38db8..5e2f7fd 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,8 +1,8 @@
 Summary: GNU macro processor
 Name: m4
 Version: 1.4.20
-Release: 3%{?dist}
-License: GPL-3.0-or-later AND GFDL-1.3-or-later AND FSFULLR AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Texinfo-exception AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND MIT
+Release: 2%{?dist}
+License: GPL-3.0-or-later AND GFDL-1.3-or-later
 Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
 Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig
 URL: https://www.gnu.org/software/m4/
@@ -50,9 +50,6 @@ make %{?_smp_mflags} check
 %{_mandir}/man1/m4.1*
 
 %changelog
-* Fri Nov 14 2025 Florian Weimer  <fweimer@redhat.com> - 1.4.20-3
-- Update License tag with build system licenses
-
 * Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 3fd3ab7..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..fce17d1
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,16 @@
+---
+# Tests for Classic and Container
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    tests:
+    - testsuite
+    required_packages:
+    - autoconf
+    - automake
+    - rpm-build
+    - wget
+
diff --git a/tests/testsuite/Makefile b/tests/testsuite/Makefile
index 12f059c..d39ae45 100644
--- a/tests/testsuite/Makefile
+++ b/tests/testsuite/Makefile
@@ -53,7 +53,7 @@ $(METADATA): Makefile
 	@echo "Type:            Regression" >> $(METADATA)
 	@echo "TestTime:        3h" >> $(METADATA)
 	@echo "RunFor:          m4" >> $(METADATA)
-	@echo "Requires:        m4 rpm-build autoconf automake gettext gcc" >> $(METADATA)
+	@echo "Requires:        m4" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2+" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf
deleted file mode 100644
index bbdfc88..0000000
--- a/tests/testsuite/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: testsuite
-description: ''
-contact: Martin Cermak <mcermak@redhat.com>
-component:
-  - m4
-test: ./runtest.sh
-framework: beakerlib
-require:
-  - m4
-  - gcc
-  - rpm-build
-  - autoconf
-  - automake
-  - gettext
-duration: 3h
-extra-summary: /tools/m4/Regression/testsuite
-extra-task: /tools/m4/Regression/testsuite
diff --git a/tests/testsuite/runtest.sh b/tests/testsuite/runtest.sh
old mode 100755
new mode 100644
index 3f1f8b5..b45984a
--- a/tests/testsuite/runtest.sh
+++ b/tests/testsuite/runtest.sh
@@ -26,10 +26,10 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="m4"
-VERSION=$(rpm -q m4 --qf '%{VERSION}')
 
 rlJournalStart
     rlPhaseStartSetup
@@ -48,8 +48,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStart FAIL "Run tests"
-        rlRun "pushd $TMPD/BUILD/m4-${VERSION}-build/m4-${VERSION}"
-        rlRun "eval `rpm --eval %___build_pre_env`"
+        rlRun "pushd $TMPD/BUILD/m4-*"
         # el7 package creates couple tests/*log files (per testcase)
         # el6 package doesn't, so we'll create some explicitly
         rlRun "make check > tests/testout.log 2> tests/testerr.log"
@@ -62,7 +61,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStart FAIL "Check for no FAILed test"
-        rlRun "[[ $(cat tests/*log | grep FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]"
+        rlRun "[[ $(cat tests/*log | grep -i FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]"
     rlPhaseEnd
 
     rlPhaseStart FAIL "Show test results summary"