diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..ce3cdc1
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,19 @@
+--- !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}
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..1ad2c12
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,6 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+    directory: tests
+execute:
+    how: beakerlib
diff --git a/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/main.fmf b/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/main.fmf
new file mode 100644
index 0000000..c24d1a1
--- /dev/null
+++ b/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/main.fmf
@@ -0,0 +1,17 @@
+summary: GNU make utility v.3.82 shipped with el7 breaks
+description: |
+    Summary: GNU make utility v.3.82 shipped with el7 breaks environment vars
+contact:
+- Michal Kolar <mkolar@redhat.com>
+component:
+- make
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- make
+- coreutils
+- sed
+- diffutils
+duration: 2m
+extra-summary: /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
+extra-task: /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
diff --git a/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh b/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
old mode 100644
new mode 100755
index 2a204c9..a3c631c
--- a/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
+++ b/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 CMD="make"
diff --git a/tests/Use-after-free-when-eval-in-variable/main.fmf b/tests/Use-after-free-when-eval-in-variable/main.fmf
new file mode 100644
index 0000000..b951a06
--- /dev/null
+++ b/tests/Use-after-free-when-eval-in-variable/main.fmf
@@ -0,0 +1,15 @@
+summary: Test for Use-after-free() when eval in variable)
+description: |
+    Summary: Use-after-free() when eval in variable assignments reassigns the same variable
+contact:
+- Marek Polacek <polacek@redhat.com>
+component:
+- make
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- make
+- coreutils
+duration: 2m
+extra-summary: /tools/make/Regression/Use-after-free-when-eval-in-variable
+extra-task: /tools/make/Regression/Use-after-free-when-eval-in-variable
diff --git a/tests/Use-after-free-when-eval-in-variable/runtest.sh b/tests/Use-after-free-when-eval-in-variable/runtest.sh
index bca1b39..dfc5e94 100755
--- a/tests/Use-after-free-when-eval-in-variable/runtest.sh
+++ b/tests/Use-after-free-when-eval-in-variable/runtest.sh
@@ -27,8 +27,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/lib/beakerlib/beakerlib.sh || exit 1
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 CMD="make"
 BIN="$(which $CMD)"
diff --git a/tests/make-3-79-has-a-parsing-bug/main.fmf b/tests/make-3-79-has-a-parsing-bug/main.fmf
new file mode 100644
index 0000000..3063c99
--- /dev/null
+++ b/tests/make-3-79-has-a-parsing-bug/main.fmf
@@ -0,0 +1,14 @@
+summary: make 3.79 has a parsing bug
+description: ''
+contact:
+- Michal Kolar <mkolar@redhat.com>
+component:
+- make
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- make
+- coreutils
+duration: 1m
+extra-summary: /tools/make/Regression/make-3-79-has-a-parsing-bug
+extra-task: /tools/make/Regression/make-3-79-has-a-parsing-bug
diff --git a/tests/make-3-79-has-a-parsing-bug/runtest.sh b/tests/make-3-79-has-a-parsing-bug/runtest.sh
index 62668f3..be60c1a 100755
--- a/tests/make-3-79-has-a-parsing-bug/runtest.sh
+++ b/tests/make-3-79-has-a-parsing-bug/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 CMD="make"
diff --git a/tests/order-only/main.fmf b/tests/order-only/main.fmf
new file mode 100644
index 0000000..19e019f
--- /dev/null
+++ b/tests/order-only/main.fmf
@@ -0,0 +1,16 @@
+summary: Test for make bug
+description: |
+    Summary: Test that make doesn't insert bogus values into order-only dependencies
+contact:
+- Petr Muller <pmuller@redhat.com>
+component:
+- make
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- make
+- coreutils
+- diffutils
+duration: 1m
+extra-summary: /tools/make/Regression/order-only
+extra-task: /tools/make/Regression/order-only
diff --git a/tests/order-only/runtest.sh b/tests/order-only/runtest.sh
index 3ff87b3..c355ea3 100755
--- a/tests/order-only/runtest.sh
+++ b/tests/order-only/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 CMD="make"
diff --git a/tests/smoke-check-make-runs/main.fmf b/tests/smoke-check-make-runs/main.fmf
new file mode 100644
index 0000000..815130d
--- /dev/null
+++ b/tests/smoke-check-make-runs/main.fmf
@@ -0,0 +1,14 @@
+summary: Show your version. Build a one-file project.
+description: ''
+contact:
+- Vaclav Kadlcik <vkadlcik@redhat.com>
+component:
+- make
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- make
+- gcc
+duration: 5m
+extra-summary: /tools/make/Sanity/smoke-check-make-runs
+extra-task: /tools/make/Sanity/smoke-check-make-runs
diff --git a/tests/smoke-check-make-runs/runtest.sh b/tests/smoke-check-make-runs/runtest.sh
index bac4bf6..57e16d5 100755
--- a/tests/smoke-check-make-runs/runtest.sh
+++ b/tests/smoke-check-make-runs/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 MAKE="$(which --skip-alias make)"
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 40deb50..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# Tests to run against Docker and Classic mode
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - container
-    tests:
-    - GNU-make-utility-v-3-82-shipped-with-el7-breaks
-    - order-only
-    - Use-after-free-when-eval-in-variable
-    - make-3-79-has-a-parsing-bug
-    - smoke-check-make-runs
-    required_packages:
-    - make
-    - coreutils
-    - diffutils
-    - sed
-    - gcc
-    - which
-
-# Tests to run against Atomic Host
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - atomic
-    tests:
-    - GNU-make-utility-v-3-82-shipped-with-el7-breaks
-    - order-only
-    - Use-after-free-when-eval-in-variable
-    - make-3-79-has-a-parsing-bug