public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [tests/selinux] pr775-checkpolicy-revdeps: convert metadata of all selinux-policy tests to TMT/FMF
@ 2026-09-11 13:19 Milos Malik
  0 siblings, 0 replies; only message in thread
From: Milos Malik @ 2026-09-11 13:19 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : tests/selinux
Branch : pr775-checkpolicy-revdeps
Commit : 1bf77a6669b1764ad3162b304717824004ca0cd3
Author : Milos Malik <mmalik@redhat.com>
Date   : 2022-04-26T13:18:49+00:00
Stats  : +2569/-202 in 101 file(s)
URL    : https://src.fedoraproject.org/tests/selinux/c/1bf77a6669b1764ad3162b304717824004ca0cd3?branch=pr775-checkpolicy-revdeps

Log:
convert metadata of all selinux-policy tests to TMT/FMF

---
diff --git a/selinux-policy/accounts-daemon-and-similar/main.fmf b/selinux-policy/accounts-daemon-and-similar/main.fmf
index 18f5328..86dea1b 100644
--- a/selinux-policy/accounts-daemon-and-similar/main.fmf
+++ b/selinux-policy/accounts-daemon-and-similar/main.fmf
@@ -1,3 +1,73 @@
-path: /selinux-policy/accounts-daemon-and-similar
-tier: 2
+summary: SELinux interferes with accounts daemon and related programs
+description: |+
+    SELinux interferes with accounts daemon and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - accountsservice
+  - glib2
+  - procps-ng
+  - realmd
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass
+  - TIPpass_Security
+  - Tier3
+  - Tier3se
+  - TierCandidatesPASS
+  - failinfedora
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1456760
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1507089
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1518211
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1595667
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1792895
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1806126
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1811407
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1815312
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1818696
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1819040
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1820978
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1820992
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1821156
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1828809
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1829013
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1829075
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1829128
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1935232
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1933842
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1933687
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1928546
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1934573
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1928565
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1928567
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+  - enabled: false
+    when: arch == aarch64, s390x
+    continue: false
+extra-nitrate: TC#0075208
+extra-summary: /CoreOS/selinux-policy/Regression/accounts-daemon-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/accounts-daemon-and-similar

diff --git a/selinux-policy/accounts-daemon-and-similar/runtest.sh b/selinux-policy/accounts-daemon-and-similar/runtest.sh
index e173541..0c64eb0 100755
--- a/selinux-policy/accounts-daemon-and-similar/runtest.sh
+++ b/selinux-policy/accounts-daemon-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/acpid-and-similar/main.fmf b/selinux-policy/acpid-and-similar/main.fmf
index 4d7c29e..cb45cc1 100644
--- a/selinux-policy/acpid-and-similar/main.fmf
+++ b/selinux-policy/acpid-and-similar/main.fmf
@@ -1,2 +1,54 @@
-path: /selinux-policy/acpid-and-similar
-tier: 2
+summary: SELinux interferes with acpid and related programs
+description: |+
+    SELinux interferes with acpid and related programs
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - acpid
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - acpid
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 30m
+enabled: true
+tag:
+  - NoRHEL4
+  - TIPfail_infra
+  - TIPpass
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=995898
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1358478
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1468548
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1622417
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1623342
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1932294
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1919167
+adjust:
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+  - enabled: false
+    when: arch == ia64, ppc64, ppc64le, s390, s390x
+    continue: false
+extra-nitrate: TC#0075209
+extra-summary: /CoreOS/selinux-policy/Regression/acpid-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/acpid-and-similar

diff --git a/selinux-policy/acpid-and-similar/runtest.sh b/selinux-policy/acpid-and-similar/runtest.sh
index bad833b..9034f7d 100755
--- a/selinux-policy/acpid-and-similar/runtest.sh
+++ b/selinux-policy/acpid-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/anon_inode-and-similar/main.fmf b/selinux-policy/anon_inode-and-similar/main.fmf
index 18a148c..e490f04 100644
--- a/selinux-policy/anon_inode-and-similar/main.fmf
+++ b/selinux-policy/anon_inode-and-similar/main.fmf
@@ -1,8 +1,37 @@
-path: /selinux-policy/anon_inode-and-similar
-summary: Test AVC issues related to tclass anon_inode
+summary: SELinux AVC issues related to anon_inode tclass policies.
 description: |
-    Test coverage for cases verifying avc denial issues related to  
-    anon_inode tclass.
+    SELinux denials affect processes that deals with anon_inode tclass.
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - libselinux
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - gcc
+  - glibc-headers
+  - setools-console
+  - audit
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 30m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1974559
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2027660
 adjust:
--   enabled: false
-    when: distro < rhel-9
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8
+    continue: false
+extra-nitrate: TC#0612643
+extra-summary: /CoreOS/selinux-policy/Regression/anon_inode-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/anon_inode-and-similar

diff --git a/selinux-policy/anon_inode-and-similar/runtest.sh b/selinux-policy/anon_inode-and-similar/runtest.sh
index 11ab2a0..e09760a 100755
--- a/selinux-policy/anon_inode-and-similar/runtest.sh
+++ b/selinux-policy/anon_inode-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/boltd-and-similar/main.fmf b/selinux-policy/boltd-and-similar/main.fmf
index 501df63..0b236f2 100644
--- a/selinux-policy/boltd-and-similar/main.fmf
+++ b/selinux-policy/boltd-and-similar/main.fmf
@@ -1,2 +1,54 @@
-path: /selinux-policy/boltd-and-similar
-tier: 2
+summary: SELinux interferes with boltd and related programs.
+description: |+
+    SELinux interferes with boltd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - glib2
+  - expect
+  - openssh-clients
+  - bolt
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 30m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPfail_Security
+  - Tier2
+  - Tier2se
+  - TierCandidatesPASS
+  - f31friendly
+  - f32friendly
+  - failinfedora
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1589086
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1625786
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1684103
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1685591
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1702243
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1704766
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1951114
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0575292
+extra-summary: /CoreOS/selinux-policy/Regression/boltd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/boltd-and-similar

diff --git a/selinux-policy/boltd-and-similar/runtest.sh b/selinux-policy/boltd-and-similar/runtest.sh
index 73c0ae6..17359a7 100755
--- a/selinux-policy/boltd-and-similar/runtest.sh
+++ b/selinux-policy/boltd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/bz481628-send-msg-to-dbus/main.fmf b/selinux-policy/bz481628-send-msg-to-dbus/main.fmf
index 8763a30..efb8889 100644
--- a/selinux-policy/bz481628-send-msg-to-dbus/main.fmf
+++ b/selinux-policy/bz481628-send-msg-to-dbus/main.fmf
@@ -1,2 +1,50 @@
-path: /selinux-policy/bz481628-send-msg-to-dbus
-tier: 2
+summary: checks if dbus daemon is able to send message to hal daemon and vice versa
+description: |+
+    SELinux interferes with D-bus daemon and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - dbus
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - expect
+  - openssh-clients
+  - dbus-daemon
+  - shadow-utils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoRHEL4
+  - TIPfail_Security
+  - TIPpass
+  - TierCandidatesPASS
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=463267
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=481628
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1546721
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1614236
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1688671
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1727887
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1754476
+adjust:
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+extra-nitrate: TC#0057414
+extra-summary: /CoreOS/selinux-policy/Regression/bz481628-send-msg-to-dbus
+extra-task: /CoreOS/selinux-policy/Regression/bz481628-send-msg-to-dbus

diff --git a/selinux-policy/bz481628-send-msg-to-dbus/runtest.sh b/selinux-policy/bz481628-send-msg-to-dbus/runtest.sh
index 19e95d7..bf6648e 100755
--- a/selinux-policy/bz481628-send-msg-to-dbus/runtest.sh
+++ b/selinux-policy/bz481628-send-msg-to-dbus/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/bz624405-pcsc-and-similar/main.fmf b/selinux-policy/bz624405-pcsc-and-similar/main.fmf
index 798179e..685536f 100644
--- a/selinux-policy/bz624405-pcsc-and-similar/main.fmf
+++ b/selinux-policy/bz624405-pcsc-and-similar/main.fmf
@@ -1,3 +1,61 @@
-path: /selinux-policy/bz624405-pcsc-and-similar
-tier: 2
+summary: SELinux interferes with pcscd
+description: |+
+    SELinux interferes with pcscd and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - pcsc-lite
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - expect
+  - grep
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - pcsc-lite
+  - policycoreutils
+  - procps
+  - selinux-policy
+  - selinux-policy-mls
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - TIPpass
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier3
+  - Tier3se
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=624405
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=752453
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1605641
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1802423
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1805719
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1806129
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1816787
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1818759
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1825182
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1825188
+adjust:
+  - enabled: false
+    when: arch == s390, s390x
+    continue: false
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+extra-nitrate: TC#0057525
+extra-summary: /CoreOS/selinux-policy/Regression/bz624405-pcsc-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/bz624405-pcsc-and-similar

diff --git a/selinux-policy/bz624405-pcsc-and-similar/runtest.sh b/selinux-policy/bz624405-pcsc-and-similar/runtest.sh
index 5123da8..5a2838f 100755
--- a/selinux-policy/bz624405-pcsc-and-similar/runtest.sh
+++ b/selinux-policy/bz624405-pcsc-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/bz733494-amanda-and-similar/main.fmf b/selinux-policy/bz733494-amanda-and-similar/main.fmf
index ee89c6c..f062952 100644
--- a/selinux-policy/bz733494-amanda-and-similar/main.fmf
+++ b/selinux-policy/bz733494-amanda-and-similar/main.fmf
@@ -1,3 +1,66 @@
-path: /selinux-policy/bz733494-amanda-and-similar
-tier: 2
+summary: SELinux interferes with amanda and related tools
+description: |+
+    SELinux interferes with amandad and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - amanda
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - amanda
+  - amanda-client
+  - amanda-server
+  - audit
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - nc
+  - net-tools
+  - nmap-ncat
+  - policycoreutils
+  - procps-ng
+  - krb5-workstation
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - xinetd
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - TIP_fedora_fail
+  - TIPfail_Apps
+  - TIPfail_Security
+  - TIPfail_fedora
+  - TIPpass
+  - TierCandidatesFAIL
+  - f32friendly
+  - failinfedora
+  - rhel9-buildroot
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=283971
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=498596
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=729361
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=733494
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=965140
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1371561
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1452444
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1623052
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1630963
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1739137
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1960513
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1065002
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1572696
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-9
+    continue: false
+extra-nitrate: TC#0114575
+extra-summary: /CoreOS/selinux-policy/Regression/bz733494-amanda-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/bz733494-amanda-and-similar

diff --git a/selinux-policy/bz733494-amanda-and-similar/runtest.sh b/selinux-policy/bz733494-amanda-and-similar/runtest.sh
index dbb4624..8e832c8 100755
--- a/selinux-policy/bz733494-amanda-and-similar/runtest.sh
+++ b/selinux-policy/bz733494-amanda-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/cockpit-ws-and-similar/main.fmf b/selinux-policy/cockpit-ws-and-similar/main.fmf
index adb81d8..1180f0a 100644
--- a/selinux-policy/cockpit-ws-and-similar/main.fmf
+++ b/selinux-policy/cockpit-ws-and-similar/main.fmf
@@ -1,3 +1,65 @@
-path: /selinux-policy/cockpit-ws-and-similar
-tier: 2
+summary: SELinux interferes with cockpit-ws and related programs
+description: |+
+    SELinux interferes with cockpit-ws, cockpit-ssh, cockpit-session and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - glib2
+  - cockpit-ws
+  - net-tools
+  - nmap-ncat
+  - cockpit-dashboard
+  - cockpit-bridge
+  - psmisc
+  - selinux-policy-devel
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPfail_Security
+  - TierCandidatesPASS
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1100808
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1214223
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1279429
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1283955
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1374572
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1381914
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1402316
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1402495
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1413509
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1561053
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1584167
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1609929
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1613638
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1615318
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1629678
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1718814
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1979182
+adjust:
+  - enabled: false
+    when: arch != x86_64
+    continue: false
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0419451
+extra-summary: /CoreOS/selinux-policy/Regression/cockpit-ws-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/cockpit-ws-and-similar

diff --git a/selinux-policy/cockpit-ws-and-similar/runtest.sh b/selinux-policy/cockpit-ws-and-similar/runtest.sh
index e0b6a92..a2807c9 100755
--- a/selinux-policy/cockpit-ws-and-similar/runtest.sh
+++ b/selinux-policy/cockpit-ws-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/colord-and-similar/main.fmf b/selinux-policy/colord-and-similar/main.fmf
index 418c370..36914c4 100644
--- a/selinux-policy/colord-and-similar/main.fmf
+++ b/selinux-policy/colord-and-similar/main.fmf
@@ -1,2 +1,57 @@
-path: /selinux-policy/colord-and-similar
-tier: 2
+summary: SELinux interferes with colord and related programs
+description: |+
+    SELinux interferes with colord and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - glib2
+  - setools-console
+  - colord
+  - initscripts
+  - expect
+environment:
+    AVC_ERROR: +no_avc_check
+    ALLOWED_USERS: staff_u user_u sysadm_u unconfined_u
+    DENIED_USERS: guest_u xguest_u
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - RHEL8
+  - TIPpass
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1373082
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1381579
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1398030
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1421247
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1460480
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1772669
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1951114
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1878094
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0276310
+extra-summary: /CoreOS/selinux-policy/Regression/colord-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/colord-and-similar

diff --git a/selinux-policy/colord-and-similar/runtest.sh b/selinux-policy/colord-and-similar/runtest.sh
index 552a1bd..f082735 100755
--- a/selinux-policy/colord-and-similar/runtest.sh
+++ b/selinux-policy/colord-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/cups-browsed-and-similar/main.fmf b/selinux-policy/cups-browsed-and-similar/main.fmf
index 6eda278..7e59ea2 100644
--- a/selinux-policy/cups-browsed-and-similar/main.fmf
+++ b/selinux-policy/cups-browsed-and-similar/main.fmf
@@ -1,3 +1,53 @@
-path: /selinux-policy/cups-browsed-and-similar
-tier: 2
+summary: SELinux interferes with cups-browsed and related programs
+description: |+
+    SELinux interferes with cups-browsed and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - cups
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - cups-filters
+  - cups
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - RHEL8
+  - TIP_fedora_pass
+  - TIPfail_infra
+  - TIPpass
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier1
+  - Tier1security
+  - Tier2se
+  - f32friendly
+  - targeted
+tier: '1'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1395801
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1401634
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1719754
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1929329
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0300676
+extra-summary: /CoreOS/selinux-policy/Regression/cups-browsed-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/cups-browsed-and-similar

diff --git a/selinux-policy/cups-browsed-and-similar/runtest.sh b/selinux-policy/cups-browsed-and-similar/runtest.sh
index 41bc812..3b7c056 100755
--- a/selinux-policy/cups-browsed-and-similar/runtest.sh
+++ b/selinux-policy/cups-browsed-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/cups-lpd-and-similar/main.fmf b/selinux-policy/cups-lpd-and-similar/main.fmf
index c9e7c44..b2ad36f 100644
--- a/selinux-policy/cups-lpd-and-similar/main.fmf
+++ b/selinux-policy/cups-lpd-and-similar/main.fmf
@@ -1,3 +1,64 @@
-path: /selinux-policy/cups-lpd-and-similar
-tier: 2
+summary: SELinux interferes with cups-lpd and related programs
+description: |+
+    SELinux interferes with cups-lpd and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - cups
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - expect
+  - policycoreutils-python-utils
+  - selinux-policy-devel
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - xinetd
+  - nmap-ncat
+  - nc
+  - net-tools
+  - cups-lpd
+  - chkconfig
+  - /usr/sbin/service
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 20m
+enabled: true
+tag:
+  - NoRHEL4
+  - RHEL8
+  - TIPfail
+  - TIPfail_infra
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - TierCandidatesFAIL
+  - customer_scenario
+  - f32friendly
+  - rhel9-buildroot
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=192216
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1004198
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1420522
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1554118
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1919399
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1947397
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2020531
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2039449
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1919173
+adjust:
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+extra-nitrate: TC#0305784
+extra-summary: /CoreOS/selinux-policy/Regression/cups-lpd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/cups-lpd-and-similar

diff --git a/selinux-policy/cups-pdf-and-similar/main.fmf b/selinux-policy/cups-pdf-and-similar/main.fmf
index 699c0b8..eee7981 100644
--- a/selinux-policy/cups-pdf-and-similar/main.fmf
+++ b/selinux-policy/cups-pdf-and-similar/main.fmf
@@ -1,2 +1,54 @@
-path: /selinux-policy/cups-pdf-and-similar
-tier: 2
+summary: SELinux interferes with cups-pdf and related programs
+description: |+
+    SELinux interferes with cups-pdf and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - cups
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - shadow-utils
+  - cups
+  - cups-pdf
+  - cups-client
+  - cups-filters
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - TIPfail_infra
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=560220
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=563977
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=570782
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1516282
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1517509
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1532043
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1594271
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1700442
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1832521
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-alt-7, rhel-8
+    continue: false
+extra-nitrate: TC#0607292
+extra-summary: /CoreOS/selinux-policy/Regression/cups-pdf-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/cups-pdf-and-similar

diff --git a/selinux-policy/cups-pdf-and-similar/runtest.sh b/selinux-policy/cups-pdf-and-similar/runtest.sh
index 9636625..2e20f6e 100755
--- a/selinux-policy/cups-pdf-and-similar/runtest.sh
+++ b/selinux-policy/cups-pdf-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/dhclient-and-similar/main.fmf b/selinux-policy/dhclient-and-similar/main.fmf
index d61123a..0504956 100644
--- a/selinux-policy/dhclient-and-similar/main.fmf
+++ b/selinux-policy/dhclient-and-similar/main.fmf
@@ -1,2 +1,27 @@
-path: /selinux-policy/dhclient-and-similar
-tier: 2
+summary: SELinux interferes with dhclient and related programs
+description: |+
+    SELinux interferes with dhclient and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - psmisc
+  - chrony
+  - dhcp-client
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1897388
+extra-summary: /CoreOS/selinux-policy/Regression/dhclient-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/dhclient-and-similar

diff --git a/selinux-policy/dhclient-and-similar/runtest.sh b/selinux-policy/dhclient-and-similar/runtest.sh
index f8263b5..9639e39 100755
--- a/selinux-policy/dhclient-and-similar/runtest.sh
+++ b/selinux-policy/dhclient-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/dmidecode-and-similar/main.fmf b/selinux-policy/dmidecode-and-similar/main.fmf
index af1851c..659e4f9 100644
--- a/selinux-policy/dmidecode-and-similar/main.fmf
+++ b/selinux-policy/dmidecode-and-similar/main.fmf
@@ -1,2 +1,55 @@
-path: /selinux-policy/dmidecode-and-similar
-tier: 2
+summary: SELinux interferes with dmidecode and related programs
+description: |+
+    SELinux interferes with dmidecode and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - dmidecode
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - dmidecode
+  - selinux-policy-devel
+  - shadow-utils
+  - openssh-clients
+  - expect
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 15m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoRHEL4
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - TierCandidatesFAIL
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=263141
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1289274
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1300799
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1608480
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1926696
+adjust:
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+  - enabled: false
+    when: arch != aarch64 and arch != i386 and arch != x86_64
+    continue: false
+extra-nitrate: TC#0550595
+extra-summary: /CoreOS/selinux-policy/Regression/dmidecode-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/dmidecode-and-similar

diff --git a/selinux-policy/dmidecode-and-similar/runtest.sh b/selinux-policy/dmidecode-and-similar/runtest.sh
index c488c8f..1885ae8 100755
--- a/selinux-policy/dmidecode-and-similar/runtest.sh
+++ b/selinux-policy/dmidecode-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/fapolicyd-and-similar/main.fmf b/selinux-policy/fapolicyd-and-similar/main.fmf
index b5b7e06..64bc4d9 100644
--- a/selinux-policy/fapolicyd-and-similar/main.fmf
+++ b/selinux-policy/fapolicyd-and-similar/main.fmf
@@ -1,3 +1,44 @@
-path: /selinux-policy/fapolicyd-and-similar
-tier: 2
-component: disabled
+summary: SELinux interferes with fapolicyd and related programs
+description: |+
+    SELinux interferes with fapolicyd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - fapolicyd
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - fapolicyd
+  - fapolicyd-selinux
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - fedora-wanted
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1865818
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1874491
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1876538
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1932225
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0608224
+extra-summary: /CoreOS/selinux-policy/Regression/fapolicyd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/fapolicyd-and-similar

diff --git a/selinux-policy/fapolicyd-and-similar/runtest.sh b/selinux-policy/fapolicyd-and-similar/runtest.sh
index 6709ce5..49ccb65 100755
--- a/selinux-policy/fapolicyd-and-similar/runtest.sh
+++ b/selinux-policy/fapolicyd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/firewalld-and-similar/main.fmf b/selinux-policy/firewalld-and-similar/main.fmf
index 4fc8344..3134d71 100644
--- a/selinux-policy/firewalld-and-similar/main.fmf
+++ b/selinux-policy/firewalld-and-similar/main.fmf
@@ -1,2 +1,70 @@
-path: /selinux-policy/firewalld-and-similar
-tier: 2
+summary: SELinux interferes with firewalld and related programs
+description: |+
+    SELinux interferes with firewalld and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - firewalld
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - firewalld
+  - glib2
+  - nftables
+  - procps-ng
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 30m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIP_fedora_pass
+  - TIPfail_fedora
+  - TIPpass
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier3
+  - Tier3se
+  - TierCandidatesPASS
+  - f32friendly
+  - f33friendly
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=907902
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=989922
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1067494
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1214853
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1221326
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1243403
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1284902
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1304721
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1304723
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1342235
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1342587
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1346316
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1375576
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1418391
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1438708
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1573501
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1593687
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1600903
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1759010
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1989641
+adjust:
+  - enabled: false
+    when: distro < rhel-7
+    continue: false
+extra-nitrate: TC#0175059
+extra-summary: /CoreOS/selinux-policy/Regression/firewalld-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/firewalld-and-similar

diff --git a/selinux-policy/firewalld-and-similar/runtest.sh b/selinux-policy/firewalld-and-similar/runtest.sh
index 57cab77..f81a5ab 100755
--- a/selinux-policy/firewalld-and-similar/runtest.sh
+++ b/selinux-policy/firewalld-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/fwupd-and-similar/main.fmf b/selinux-policy/fwupd-and-similar/main.fmf
index 2425d89..1017ddb 100644
--- a/selinux-policy/fwupd-and-similar/main.fmf
+++ b/selinux-policy/fwupd-and-similar/main.fmf
@@ -1,2 +1,55 @@
-path: /selinux-policy/fwupd-and-similar
-tier: 2
+summary: SELinux interferes with fwupd and related programs
+description: |+
+    SELinux interferes with fwupd and related programs.
+    Standalone service and confined users are tested.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - glib2
+  - fwupd
+  - initscripts
+  - expect
+environment:
+    AVC_ERROR: +no_avc_check
+    ALLOWED_USERS: staff_u user_u sysadm_u unconfined_u
+    DENIED_USERS: guest_u xguest_u
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPfail
+  - TIPfail_Security
+  - Tier3
+  - Tier3se
+  - TierCandidatesPASS
+  - failinfedora
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1772619
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1832231
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1832234
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1832772
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1851932
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1860924
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1878094
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0563429
+extra-summary: /CoreOS/selinux-policy/Regression/fwupd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/fwupd-and-similar

diff --git a/selinux-policy/fwupd-and-similar/runtest.sh b/selinux-policy/fwupd-and-similar/runtest.sh
index e7f5b3f..91b2300 100755
--- a/selinux-policy/fwupd-and-similar/runtest.sh
+++ b/selinux-policy/fwupd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/getrlimit-permission/main.fmf b/selinux-policy/getrlimit-permission/main.fmf
index 2ddf9f6..b092bb7 100644
--- a/selinux-policy/getrlimit-permission/main.fmf
+++ b/selinux-policy/getrlimit-permission/main.fmf
@@ -1,5 +1,44 @@
-path: /selinux-policy/getrlimit-permission
-tier: 2
+summary: Is the getrlimit permission defined? Are appropriate checks applied?
+description: |+
+    Is the getrlimit permission defined? Are { getrlimit } SELinux denials triggered when certain access happens?
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - util-linux
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPfail_Security
+  - Tier1
+  - Tier1se
+  - f33friendly
+  - targeted
+tier: '1'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1549691
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1549772
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2008965
 adjust:
-- enabled: false
-  when: distro < rhel-7
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7
+    continue: false
+extra-nitrate: TC#0574397
+extra-summary: /CoreOS/selinux-policy/Sanity/getrlimit-permission
+extra-task: /CoreOS/selinux-policy/Sanity/getrlimit-permission

diff --git a/selinux-policy/getrlimit-permission/runtest.sh b/selinux-policy/getrlimit-permission/runtest.sh
index 846434e..d1313eb 100755
--- a/selinux-policy/getrlimit-permission/runtest.sh
+++ b/selinux-policy/getrlimit-permission/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/hostapd-and-similar/main.fmf b/selinux-policy/hostapd-and-similar/main.fmf
index 2c5835e..6701f36 100644
--- a/selinux-policy/hostapd-and-similar/main.fmf
+++ b/selinux-policy/hostapd-and-similar/main.fmf
@@ -1,2 +1,57 @@
-path: /selinux-policy/hostapd-and-similar
-tier: 2
+summary: SELinux interferes with hostapd and related programs
+description: |+
+    SELinux interferes with hostapd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - hostapd
+  - /usr/sbin/service
+  - kernel-modules-internal
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL8
+  - TIPpass_Security
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1224405
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1225245
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1237343
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1266068
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1273570
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1278569
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1282179
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1334021
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1343683
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1977676
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1979968
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1784253
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2032277
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2064688
+adjust:
+  - enabled: false
+    when: arch == s390x
+    continue: false
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0602539
+extra-summary: /CoreOS/selinux-policy/Regression/hostapd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/hostapd-and-similar

diff --git a/selinux-policy/journalctl-and-similar/main.fmf b/selinux-policy/journalctl-and-similar/main.fmf
index cf8103f..ae50c2f 100644
--- a/selinux-policy/journalctl-and-similar/main.fmf
+++ b/selinux-policy/journalctl-and-similar/main.fmf
@@ -1,2 +1,51 @@
-path: /selinux-policy/journalctl-and-similar
-tier: 2
+summary: SELinux interferes with journalctl executed by various users
+description: |+
+    SELinux interferes with journalctl executed by various users.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - systemd
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - systemd
+  - shadow-utils
+environment:
+    AVC_ERROR: +no_avc_check
+    ALLOWED_USERS: staff_u user_u sysadm_u unconfined_u
+    DENIED_USERS: guest_u xguest_u
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPfail
+  - TIPfail_Security
+  - TIPfail_systemd
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1176713
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1288255
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1685689
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1825894
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2017838
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1703241
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0597884
+extra-summary: /CoreOS/selinux-policy/Regression/journalctl-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/journalctl-and-similar

diff --git a/selinux-policy/journalctl-and-similar/runtest.sh b/selinux-policy/journalctl-and-similar/runtest.sh
index d7b8fd7..7c471e9 100755
--- a/selinux-policy/journalctl-and-similar/runtest.sh
+++ b/selinux-policy/journalctl-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/kerberos-and-similar/main.fmf b/selinux-policy/kerberos-and-similar/main.fmf
index f55e70a..d51db70 100644
--- a/selinux-policy/kerberos-and-similar/main.fmf
+++ b/selinux-policy/kerberos-and-similar/main.fmf
@@ -1,5 +1,61 @@
-path: /selinux-policy/kerberos-and-similar
-summary: SELinux interferes with various kerberos daemons and related programs.
-description: |
-    Test coverage for SELinux AVC issues against kerberos daemon and related
-    programs. 
+summary: SELinux interferes with kerberos programs
+description: |+
+    SELinux interferes with various kerberos daemons and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - krb5
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - krb5-server
+  - krb5-libs
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 30m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - TipWaived6
+  - TipWaived7
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=698923
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=713218
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=860666
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=910837
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1041629
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1065460
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1153561
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1210421
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1220691
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1220763
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1319933
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1337895
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1368492
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1452215
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1600705
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1601004
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1619252
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1664983
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1669975
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0230498
+extra-summary: /CoreOS/selinux-policy/Regression/kerberos-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/kerberos-and-similar

diff --git a/selinux-policy/kerberos-and-similar/runtest.sh b/selinux-policy/kerberos-and-similar/runtest.sh
index 60a9c1a..ce2c4f6 100755
--- a/selinux-policy/kerberos-and-similar/runtest.sh
+++ b/selinux-policy/kerberos-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/ladvd/main.fmf b/selinux-policy/ladvd/main.fmf
index 4e8b1a5..7fae35a 100644
--- a/selinux-policy/ladvd/main.fmf
+++ b/selinux-policy/ladvd/main.fmf
@@ -1,8 +1,30 @@
-path: /selinux-policy/ladvd
-summary: Test ladvd utility to verify AVC denials
-description: |
-    Test coverage for SELinux AVC issues related ladvd service. This
-    test suite primarily verifies two bugs ie bz1834325 and bz1855163. 
-adjust:
--   enabled: false
-    when: distro <= rhel-8
+summary: Tests for ladvd service
+description: |+
+    Test coverage for SELinux AVC issues related to ladvd service.
+
+contact: Amith Kumar <apeetham@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - kernel-headers
+  - ladvd
+  - ladvd-selinux
+  - libpcap
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 1h
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1834325
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1855163
+extra-summary: /CoreOS/selinux-policy/Regression/ladvd
+extra-task: /CoreOS/selinux-policy/Regression/ladvd

diff --git a/selinux-policy/ladvd/runtest.sh b/selinux-policy/ladvd/runtest.sh
index c213597..211f280 100755
--- a/selinux-policy/ladvd/runtest.sh
+++ b/selinux-policy/ladvd/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/lockdown-class/main.fmf b/selinux-policy/lockdown-class/main.fmf
index be3fc65..2ea12ab 100644
--- a/selinux-policy/lockdown-class/main.fmf
+++ b/selinux-policy/lockdown-class/main.fmf
@@ -1,3 +1,26 @@
-path: /selinux-policy/lockdown-class
-tier: 2
+summary: Is the lockdown class + its permissions defined in SELinux policy?
+description: |+
+    Description: Is the lockdown class + its permissions defined in SELinux policy?
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1915184
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1929332
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1933134
+extra-summary: /CoreOS/selinux-policy/Sanity/lockdown-class
+extra-task: /CoreOS/selinux-policy/Sanity/lockdown-class

diff --git a/selinux-policy/lockdown-class/runtest.sh b/selinux-policy/lockdown-class/runtest.sh
index 9bed740..02e7682 100755
--- a/selinux-policy/lockdown-class/runtest.sh
+++ b/selinux-policy/lockdown-class/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/nasd-and-similar/main.fmf b/selinux-policy/nasd-and-similar/main.fmf
index f026e8d..cd0bc98 100644
--- a/selinux-policy/nasd-and-similar/main.fmf
+++ b/selinux-policy/nasd-and-similar/main.fmf
@@ -1,2 +1,24 @@
-path: /selinux-policy/nasd-and-similar
-tier: 2
+summary: SELinux interferes with the nasd service and related programs
+description: |+
+    SELinux interferes with the nasd service and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - nas
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - nas
+  - /usr/sbin/service
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+extra-summary: /CoreOS/selinux-policy/Regression/nasd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/nasd-and-similar

diff --git a/selinux-policy/nasd-and-similar/runtest.sh b/selinux-policy/nasd-and-similar/runtest.sh
index bcf3369..b6f8c17 100755
--- a/selinux-policy/nasd-and-similar/runtest.sh
+++ b/selinux-policy/nasd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/nfsdcld-and-similar/main.fmf b/selinux-policy/nfsdcld-and-similar/main.fmf
index 5dbc685..bdad94b 100644
--- a/selinux-policy/nfsdcld-and-similar/main.fmf
+++ b/selinux-policy/nfsdcld-and-similar/main.fmf
@@ -1,5 +1,39 @@
-path: /selinux-policy/nfsdcld-and-similar
-tier: 2
+summary: SELinux interferes with the nfsdcld service and related programs
+description: |+
+    SELinux interferes with the nfsdcld service and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - /usr/sbin/service
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - nfs-utils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1834234
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2026588
 adjust:
--   enabled: false
-    when: distro < rhel-8
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0608104
+extra-summary: /CoreOS/selinux-policy/Regression/nfsdcld-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/nfsdcld-and-similar

diff --git a/selinux-policy/nfsdcld-and-similar/runtest.sh b/selinux-policy/nfsdcld-and-similar/runtest.sh
index bb43287..bf4b321 100755
--- a/selinux-policy/nfsdcld-and-similar/runtest.sh
+++ b/selinux-policy/nfsdcld-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/numad-and-similar/main.fmf b/selinux-policy/numad-and-similar/main.fmf
index e1d0e95..fd55273 100644
--- a/selinux-policy/numad-and-similar/main.fmf
+++ b/selinux-policy/numad-and-similar/main.fmf
@@ -1,2 +1,53 @@
-path: /selinux-policy/numad-and-similar
-tier: 2
+summary: SELinux interferes with numad and related programs
+description: |+
+    SELinux interferes with numad and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - expect
+  - grep
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - numad
+  - policycoreutils
+  - procps
+  - selinux-policy
+  - setools
+  - setools-console
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier3
+  - Tier3se
+  - TipWaived7
+  - failinfedora
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=807157
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=857086
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1074449
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1118515
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+  - enabled: false
+    when: arch != x86_64 and arch != ppc64 and arch != ppc64le
+    continue: false
+extra-nitrate: TC#0202428
+extra-summary: /CoreOS/selinux-policy/Regression/numad-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/numad-and-similar

diff --git a/selinux-policy/numad-and-similar/runtest.sh b/selinux-policy/numad-and-similar/runtest.sh
old mode 100644
new mode 100755
index 0c639ef..3d2efe1
--- a/selinux-policy/numad-and-similar/runtest.sh
+++ b/selinux-policy/numad-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/pam_console-and-related/main.fmf b/selinux-policy/pam_console-and-related/main.fmf
index 96a80b5..6cc4b25 100644
--- a/selinux-policy/pam_console-and-related/main.fmf
+++ b/selinux-policy/pam_console-and-related/main.fmf
@@ -1,2 +1,52 @@
-path: /selinux-policy/pam_console-and-related
-tier: 2
+summary: Does SELinux cooperate with pam_console_apply and pam_console.so?
+description: |+
+    Does SELinux cooperate with pam_console_apply and pam_console.so?
+    Confined and unconfined users are tested using SSH.
+
+    This TC uses following parameters which can be overriden:
+     * ALLOWED_USERS - which SELinux users should be tested?
+     * DENIED_USERS - which SELinux users should NOT be tested?
+
+contact: aborah@redhat.com
+component:
+  - pam
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - pam
+  - psmisc
+  - binutils
+  - shadow-utils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPfail
+  - TIPpass_Security
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=204986
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=251104
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1817690
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+extra-nitrate: TC#0606229
+extra-summary: /CoreOS/selinux-policy/Regression/pam_console-and-related
+extra-task: /CoreOS/selinux-policy/Regression/pam_console-and-related

diff --git a/selinux-policy/pam_console-and-related/runtest.sh b/selinux-policy/pam_console-and-related/runtest.sh
index 8d35eac..812c07c 100755
--- a/selinux-policy/pam_console-and-related/runtest.sh
+++ b/selinux-policy/pam_console-and-related/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/pam_limits-and-related/main.fmf b/selinux-policy/pam_limits-and-related/main.fmf
index 7d613d7..9e10d36 100644
--- a/selinux-policy/pam_limits-and-related/main.fmf
+++ b/selinux-policy/pam_limits-and-related/main.fmf
@@ -1,2 +1,47 @@
-path: /selinux-policy/pam_limits-and-related
-tier: 2
+summary: Does SELinux cooperate with pam_limits.so?
+description: |+
+    Does SELinux cooperate with pam_limits.so?
+    Confined and unconfined users are tested using SSH.
+
+    This TC uses following parameters which can be overriden:
+     * ALLOWED_USERS - which SELinux users should be tested?
+     * DENIED_USERS - which SELinux users should NOT be tested?
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - pam
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - pam
+  - shadow-utils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1958819
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2039453
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0612789
+extra-summary: /CoreOS/selinux-policy/Regression/pam_limits-and-related
+extra-task: /CoreOS/selinux-policy/Regression/pam_limits-and-related

diff --git a/selinux-policy/pam_limits-and-related/runtest.sh b/selinux-policy/pam_limits-and-related/runtest.sh
index cfc7036..b7a03ff 100755
--- a/selinux-policy/pam_limits-and-related/runtest.sh
+++ b/selinux-policy/pam_limits-and-related/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/pam_timestamp-and-related/main.fmf b/selinux-policy/pam_timestamp-and-related/main.fmf
index a83b2cb..12696ae 100644
--- a/selinux-policy/pam_timestamp-and-related/main.fmf
+++ b/selinux-policy/pam_timestamp-and-related/main.fmf
@@ -1,2 +1,59 @@
-path: /selinux-policy/pam_timestamp-and-related
-tier: 2
+summary: Does SELinux cooperate with pam_timestamp_check and pam_timestamp.so?
+description: |+
+    Does SELinux cooperate with pam_timestamp_check and pam_timestamp.so?
+    Confined and unconfined users are tested using SSH.
+
+    This TC uses following parameters which can be overriden:
+     * ALLOWED_USERS - which SELinux users should be tested?
+     * DENIED_USERS - which SELinux users should NOT be tested?
+     * TIMESTAMP_DIR - in which directory is the _pam_timestamp_key file stored?
+
+contact: aborah@redhat.com
+component:
+  - pam
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - pam
+  - psmisc
+  - binutils
+  - shadow-utils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass
+  - TIPpass_Security
+  - f32friendly
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1791957
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+  - environment:
+        TIMESTAMP_DIR: /run/sudo
+    when: distro == rhel-7
+    continue: false
+  - enabled: false
+    when: distro ~<= rhel-8.2
+    continue: false
+extra-nitrate: TC#0606210
+extra-summary: /CoreOS/selinux-policy/Regression/pam_timestamp-and-related
+extra-task: /CoreOS/selinux-policy/Regression/pam_timestamp-and-related

diff --git a/selinux-policy/pam_timestamp-and-related/runtest.sh b/selinux-policy/pam_timestamp-and-related/runtest.sh
index 051cdaa..f1a7b86 100755
--- a/selinux-policy/pam_timestamp-and-related/runtest.sh
+++ b/selinux-policy/pam_timestamp-and-related/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/pcp-daemons-and-similar/main.fmf b/selinux-policy/pcp-daemons-and-similar/main.fmf
index d9d0f61..fa32730 100644
--- a/selinux-policy/pcp-daemons-and-similar/main.fmf
+++ b/selinux-policy/pcp-daemons-and-similar/main.fmf
@@ -1,5 +1,68 @@
-path: /selinux-policy/pcp-daemons-and-similar
-summary: SELinux issues related to pcp deamons and related programs
-description: |
-   Test coverage for SELinux AVC issues against pcp and related programs.
+summary: the services were running as initrc_t, now they are confined by SELinux
+description: |+
+    SELinux interferes with various PCP services and related programs.
 
+contact: jkurik@redhat.com
+component:
+  - selinux-policy
+  - pcp
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - glib2
+  - pcp
+  - pcp-manager
+  - pcp-pmda-dm
+  - pcp-webapi
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 90m
+enabled: true
+tag:
+  - NoRHEL4
+  - TIPfail_FIPS
+  - TIPpass
+  - TIPpass_Security
+  - TipWaived7
+  - f32friendly
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1028598
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1061159
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1064233
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1072785
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1089912
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1130606
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1130934
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1167825
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1196926
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1203153
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1206525
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1211520
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1213709
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1213740
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1252341
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1261811
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1271998
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1286234
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1309883
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1379371
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1770123
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1886369
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1309454
+adjust:
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+extra-nitrate: TC#0075517
+extra-summary: /CoreOS/selinux-policy/Regression/pcp-daemons-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/pcp-daemons-and-similar

diff --git a/selinux-policy/pcp-daemons-and-similar/runtest.sh b/selinux-policy/pcp-daemons-and-similar/runtest.sh
index 9103fda..c22a7e8 100755
--- a/selinux-policy/pcp-daemons-and-similar/runtest.sh
+++ b/selinux-policy/pcp-daemons-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/perf_event-and-related/main.fmf b/selinux-policy/perf_event-and-related/main.fmf
index bc46d09..4e794c4 100644
--- a/selinux-policy/perf_event-and-related/main.fmf
+++ b/selinux-policy/perf_event-and-related/main.fmf
@@ -1,3 +1,43 @@
-path: /selinux-policy/perf_event-and-related
-tier: 2
+summary: Is the perf_event class and its permissions defined?
+description: |+
+    Description: Is the perf_event class and its permissions defined? Does SELinux allow various perf_event aware programs to work?
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - perf
+  - expect
+  - openssh-clients
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1901957
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1901958
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2019929
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2070982
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0609306
+extra-summary: /CoreOS/selinux-policy/Regression/perf_event-and-related
+extra-task: /CoreOS/selinux-policy/Regression/perf_event-and-related

diff --git a/selinux-policy/perf_event-and-related/runtest.sh b/selinux-policy/perf_event-and-related/runtest.sh
index f5fb5c1..987d2a5 100755
--- a/selinux-policy/perf_event-and-related/runtest.sh
+++ b/selinux-policy/perf_event-and-related/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/ping-and-similar/main.fmf b/selinux-policy/ping-and-similar/main.fmf
index 8d535ce..f07662d 100644
--- a/selinux-policy/ping-and-similar/main.fmf
+++ b/selinux-policy/ping-and-similar/main.fmf
@@ -1,2 +1,46 @@
-path: /selinux-policy/ping-and-similar
-tier: 2
+summary: the service was running as initrc_t or init_t, now it is confined by SELinux
+description: |+
+    SELinux interferes with ping and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - iputils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoRHEL4
+  - TIPpass
+  - TIPpass_Security
+  - TierCandidatesPASS
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1552128
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1596065
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1803759
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1810403
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1848929
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2070870
+adjust:
+  - enabled: false
+    when: distro == rhel-4
+    continue: false
+extra-nitrate: TC#0564077
+extra-summary: /CoreOS/selinux-policy/Regression/ping-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/ping-and-similar

diff --git a/selinux-policy/ping-and-similar/runtest.sh b/selinux-policy/ping-and-similar/runtest.sh
index e00656a..6262122 100755
--- a/selinux-policy/ping-and-similar/runtest.sh
+++ b/selinux-policy/ping-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/policy-rpm-macros/main.fmf b/selinux-policy/policy-rpm-macros/main.fmf
index 498e8f4..19fdd8e 100644
--- a/selinux-policy/policy-rpm-macros/main.fmf
+++ b/selinux-policy/policy-rpm-macros/main.fmf
@@ -1,2 +1,42 @@
-path: /selinux-policy/policy-rpm-macros
-tier: 1
+summary: Are necessary RPM macros defined for various policy actions?
+description: |+
+    Are necessary RPM macros defined for various policy actions? Are they defined correctly?
+
+    More information at:
+     * https://plautrba.fedorapeople.org/blok/Fedora-SELinux-module-packaging.html
+     * https://github.com/fedora-selinux/selinux-policy-macros/blob/master/README.adoc
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+recommend:
+  - git
+  - selinux-policy
+  - /usr/sbin/semanage
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass_Security
+  - Tier1
+  - Tier1se
+  - f32friendly
+  - targeted
+tier: '1'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1380854
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1415694
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1518609
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1488402
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1633198
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1631814
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1465824
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-8
+    continue: false
+extra-nitrate: TC#0546229
+extra-summary: /CoreOS/selinux-policy/Sanity/policy-rpm-macros
+extra-task: /CoreOS/selinux-policy/Sanity/policy-rpm-macros

diff --git a/selinux-policy/policy-rpm-macros/runtest.sh b/selinux-policy/policy-rpm-macros/runtest.sh
index b203b16..58aa091 100755
--- a/selinux-policy/policy-rpm-macros/runtest.sh
+++ b/selinux-policy/policy-rpm-macros/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/policykit-general/main.fmf b/selinux-policy/policykit-general/main.fmf
new file mode 100644
index 0000000..4b69496
--- /dev/null
+++ b/selinux-policy/policykit-general/main.fmf
@@ -0,0 +1,60 @@
+summary: Test for BZ#962791 (SELinux is preventing /usr/lib/polkit-1/polkitd)
+description: |+
+    SELinux interferes with polkitd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - polkit
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - selinux-policy
+  - polkit
+  - glib2
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - setools-console
+  - psmisc
+  - shadow-utils
+  - expect
+  - openssh-clients
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 20m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - TipWaived7
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=960669
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=962791
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=965143
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1003799
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1301561
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1364513
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1574389
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1583082
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1727902
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1951114
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1878094
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0267065
+extra-summary: /CoreOS/selinux-policy/Regression/policykit-general
+extra-task: /CoreOS/selinux-policy/Regression/policykit-general

diff --git a/selinux-policy/policykit-general/runtest.sh b/selinux-policy/policykit-general/runtest.sh
index b3b11e5..6388404 100755
--- a/selinux-policy/policykit-general/runtest.sh
+++ b/selinux-policy/policykit-general/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/rngd-and-similar/main.fmf b/selinux-policy/rngd-and-similar/main.fmf
index 9c9828b..c42e941 100644
--- a/selinux-policy/rngd-and-similar/main.fmf
+++ b/selinux-policy/rngd-and-similar/main.fmf
@@ -1,2 +1,70 @@
-path: /selinux-policy/rngd-and-similar
-tier: 2
+summary: SELinux interferes with rngd and related programs
+description: |+
+    SELinux interferes with rngd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - rng-tools
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - TierCandidatesPASS
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=869810
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=869813
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1451735
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1452629
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1496260
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1609466
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1611413
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1612456
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1653872
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1655079
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1656054
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1657250
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1658234
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1698575
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1699278
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1700222
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1787663
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1789902
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1787661
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1928572
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1929360
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1929366
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1931450
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+  - enabled: false
+    when: arch == s390x
+    continue: false
+extra-nitrate: TC#0300433
+extra-summary: /CoreOS/selinux-policy/Regression/rngd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/rngd-and-similar

diff --git a/selinux-policy/rngd-and-similar/runtest.sh b/selinux-policy/rngd-and-similar/runtest.sh
index 5113fdc..884cbdf 100755
--- a/selinux-policy/rngd-and-similar/runtest.sh
+++ b/selinux-policy/rngd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/rpmdb-and-similar/main.fmf b/selinux-policy/rpmdb-and-similar/main.fmf
index 9090977..a5fb8b4 100644
--- a/selinux-policy/rpmdb-and-similar/main.fmf
+++ b/selinux-policy/rpmdb-and-similar/main.fmf
@@ -1,3 +1,45 @@
-path: /selinux-policy/rpmdb-and-similar
-tier: 2
+summary: SELinux interferes with rpmdb program, rpmdb-rebuild service and related
+    programs
+description: |+
+    SELinux interferes with rpmdb program, rpmdb-rebuild service and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - initscripts
+  - sssd
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1898298
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1899548
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1900383
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1900386
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1900388
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1900390
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1900391
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8
+    continue: false
+extra-nitrate: TC#0609732
+extra-summary: /CoreOS/selinux-policy/Regression/rpmdb-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/rpmdb-and-similar

diff --git a/selinux-policy/rpmdb-and-similar/runtest.sh b/selinux-policy/rpmdb-and-similar/runtest.sh
index af6e687..13c5442 100755
--- a/selinux-policy/rpmdb-and-similar/runtest.sh
+++ b/selinux-policy/rpmdb-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/rrdcached-service-and-related/main.fmf b/selinux-policy/rrdcached-service-and-related/main.fmf
index 9d47d7a..d46b6a1 100644
--- a/selinux-policy/rrdcached-service-and-related/main.fmf
+++ b/selinux-policy/rrdcached-service-and-related/main.fmf
@@ -1,2 +1,40 @@
-path: /selinux-policy/rrdcached-service-and-related
-tier: 2
+summary: Basic test for rrdcached service
+description: ''
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - libselinux-utils
+  - policycoreutils
+  - rrdtool
+  - selinux-policy
+  - setools-console
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoFedora30
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - TIPpass
+  - TIPpass_Security
+  - f32friendly
+  - f33friendly
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1726255
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0604406
+extra-summary: /CoreOS/selinux-policy/Regression/rrdcached-service-and-related
+extra-task: /CoreOS/selinux-policy/Regression/rrdcached-service-and-related

diff --git a/selinux-policy/rrdcached-service-and-related/runtest.sh b/selinux-policy/rrdcached-service-and-related/runtest.sh
index 56b1a25..d26e456 100755
--- a/selinux-policy/rrdcached-service-and-related/runtest.sh
+++ b/selinux-policy/rrdcached-service-and-related/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/rsyslog-and-similar/main.fmf b/selinux-policy/rsyslog-and-similar/main.fmf
index 5e28009..0603f76 100644
--- a/selinux-policy/rsyslog-and-similar/main.fmf
+++ b/selinux-policy/rsyslog-and-similar/main.fmf
@@ -1,8 +1,43 @@
-path: /selinux-policy/rsyslog-and-similar
-summary: Test rsyslog service and verify AVC denials
-description: |
-    Test coverage for rsyslog service with different configurations and 
-    verify related SELinux AVC issues.
+summary: SELinux AVCs with rsyslog in various configurations
+description: |+
+    SELinux interferes with rsyslogd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - rsyslog
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - logwatch
+  - policycoreutils
+  - policycoreutils-devel
+  - rsyslog
+  - rsyslog-gnutls
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - shadow-utils
+  - /usr/sbin/semanage
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 30m
+enabled: true
+tag:
+  - NoRHEL4
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1823669
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1823672
 adjust:
--   enabled: false
-    when: distro < rhel-8
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7
+    continue: false
+extra-nitrate: TC#0609007
+extra-summary: /CoreOS/selinux-policy/Regression/rsyslog-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/rsyslog-and-similar

diff --git a/selinux-policy/rsyslog-and-similar/runtest.sh b/selinux-policy/rsyslog-and-similar/runtest.sh
index 24f0b0e..a3f33a9 100755
--- a/selinux-policy/rsyslog-and-similar/runtest.sh
+++ b/selinux-policy/rsyslog-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/rtkit-daemon-and-similar/main.fmf b/selinux-policy/rtkit-daemon-and-similar/main.fmf
index 1aec75d..1cba664 100644
--- a/selinux-policy/rtkit-daemon-and-similar/main.fmf
+++ b/selinux-policy/rtkit-daemon-and-similar/main.fmf
@@ -1,25 +1,59 @@
-path: /selinux-policy/rtkit-daemon-and-similar
-summary: SELinux interferes with rtkit daemon and related programs 
-description: |
-    Test coverage for SELinux AVC issues against rtkit daemon and related programs. 
+summary: SELinux interferes with rtkit-daemon and related programs
+description: |+
+    SELinux interferes with rtkit daemon and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
 component:
   - selinux-policy
-framework: beakerlib
 require:
   - library(selinux-policy/common)
 recommend:
   - audit
+  - initscripts
+  - libselinux
   - libselinux-utils
   - policycoreutils
-  - rtkit
   - selinux-policy
   - selinux-policy-targeted
+  - glib2
   - setools-console
-  - /usr/sbin/service
-duration: 15m
+  - rtkit
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - CI-Tier-1
+  - NoRHEL4
+  - NoRHEL5
+  - TIP_fedora_fail
+  - TIPfail
+  - TIPpass_FIPS
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - TierCandidatesPASS
+  - f31friendly
+  - f32friendly
+  - targeted
 tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1626982
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1703241
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1720546
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1750024
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1752583
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1754408
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1755572
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1756755
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1758097
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1760214
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1873658
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1910507
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5
     continue: false
-
+extra-nitrate: TC#0300678
+extra-summary: /CoreOS/selinux-policy/Regression/rtkit-daemon-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/rtkit-daemon-and-similar

diff --git a/selinux-policy/smbcontrol-and-similar/main.fmf b/selinux-policy/smbcontrol-and-similar/main.fmf
index 9bf5795..9be8abc 100644
--- a/selinux-policy/smbcontrol-and-similar/main.fmf
+++ b/selinux-policy/smbcontrol-and-similar/main.fmf
@@ -1,2 +1,50 @@
-path: /selinux-policy/smbcontrol-and-similar
-tier: 2
+summary: SELinux interferes with smbcontrol and related programs
+description: |+
+    SELinux interferes with smbcontrol and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - samba-common
+  - samba-common-tools
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass_Security
+  - Tier3
+  - Tier3se
+  - TierCandidatesPASS
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1326371
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1326621
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1574518
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1574521
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2025931
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2027740
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2027751
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2033873
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2038157
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2038963
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0522115
+extra-summary: /CoreOS/selinux-policy/Regression/smbcontrol-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/smbcontrol-and-similar

diff --git a/selinux-policy/smbcontrol-and-similar/runtest.sh b/selinux-policy/smbcontrol-and-similar/runtest.sh
index f6f219e..02d9bc7 100755
--- a/selinux-policy/smbcontrol-and-similar/runtest.sh
+++ b/selinux-policy/smbcontrol-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/sslh-and-similar/main.fmf b/selinux-policy/sslh-and-similar/main.fmf
index 68fc1a3..b2ebcd6 100644
--- a/selinux-policy/sslh-and-similar/main.fmf
+++ b/selinux-policy/sslh-and-similar/main.fmf
@@ -1,3 +1,45 @@
-path: /selinux-policy/sslh-and-similar
-tier: 2
+summary: SELinux interferes with sslh and related programs
+description: |+
+    SELinux interferes with sslh and related programs.
 
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools
+  - setools-console
+  - sslh
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass_Security
+  - TierCandidatesPASS
+  - f32friendly
+  - f33friendly
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1534624
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+  - enabled: false
+    when: arch == s390x
+    continue: false
+extra-nitrate: TC#0563428
+extra-summary: /CoreOS/selinux-policy/Regression/sslh-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/sslh-and-similar

diff --git a/selinux-policy/sslh-and-similar/runtest.sh b/selinux-policy/sslh-and-similar/runtest.sh
index 7979d33..0bfdece 100755
--- a/selinux-policy/sslh-and-similar/runtest.sh
+++ b/selinux-policy/sslh-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/swap-file-and-systemd-access/main.fmf b/selinux-policy/swap-file-and-systemd-access/main.fmf
index b2d17da..266f814 100644
--- a/selinux-policy/swap-file-and-systemd-access/main.fmf
+++ b/selinux-policy/swap-file-and-systemd-access/main.fmf
@@ -1,2 +1,49 @@
-path: /selinux-policy/swap-file-and-systemd-access
-tier: 2
+summary: SELinux interferes with systemd when accessing a swap file
+description: |+
+    SELinux interferes with systemd when accessing swap files or swap partitions.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - systemd
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - setools-console
+  - systemd
+  - util-linux
+  - binutils
+environment:
+    AVC_ERROR: +no_avc_check
+    REAL_SCENARIOS: 'false'
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - TIPpass
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1367279
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1797543
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1798872
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1845594
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1850177
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1912385
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1926536
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1928539
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1968610
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1890884
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0605834
+extra-summary: /CoreOS/selinux-policy/Regression/swap-file-and-systemd-access
+extra-task: /CoreOS/selinux-policy/Regression/swap-file-and-systemd-access

diff --git a/selinux-policy/swap-file-and-systemd-access/runtest.sh b/selinux-policy/swap-file-and-systemd-access/runtest.sh
index 76c651a..4dc1413 100755
--- a/selinux-policy/swap-file-and-systemd-access/runtest.sh
+++ b/selinux-policy/swap-file-and-systemd-access/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/systemd-bootchart-and-similar/main.fmf b/selinux-policy/systemd-bootchart-and-similar/main.fmf
index 4b59e45..ca151c8 100644
--- a/selinux-policy/systemd-bootchart-and-similar/main.fmf
+++ b/selinux-policy/systemd-bootchart-and-similar/main.fmf
@@ -1,2 +1,38 @@
-path: /selinux-policy/systemd-bootchart-and-similar
-tier: 2
+summary: SELinux interferes with systemd-bootchart and related programs
+description: |+
+    SELinux interferes with systemd-bootchart and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - systemd-bootchart
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1757050
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1838163
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-8, rhel-9
+    continue: false
+extra-nitrate: TC#0608092
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-bootchart-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/systemd-bootchart-and-similar

diff --git a/selinux-policy/systemd-bootchart-and-similar/runtest.sh b/selinux-policy/systemd-bootchart-and-similar/runtest.sh
index 8577ea3..c8bbacd 100755
--- a/selinux-policy/systemd-bootchart-and-similar/runtest.sh
+++ b/selinux-policy/systemd-bootchart-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/systemd-homed/main.fmf b/selinux-policy/systemd-homed/main.fmf
index 2858935..d74f466 100644
--- a/selinux-policy/systemd-homed/main.fmf
+++ b/selinux-policy/systemd-homed/main.fmf
@@ -1,10 +1,24 @@
-path: /selinux-policy/systemd-homed
-summary: Test homectl utility and its sub-commands to verify AVC denials
-description: |
-    Test coverage for SELinux AVC issues associated with systemd-homed 
-    service. The homectl program calls the systemd-homed service, which 
-    is not yet confined, but it triggers SELinux denials. This test suite
-    covers command homectl with its subcommands and checks for avc denials.
-adjust:
--   enabled: false
-    when: distro < rhel-9
+summary: Tests for systemd-homed service
+contact: Amith Kumar <apeetham@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - expect
+  - initscripts
+  - systemd
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 1h
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1809878
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-homed
+extra-task: /CoreOS/selinux-policy/Regression/systemd-homed

diff --git a/selinux-policy/systemd-homed/runtest.sh b/selinux-policy/systemd-homed/runtest.sh
index 3357cae..6a5d196 100755
--- a/selinux-policy/systemd-homed/runtest.sh
+++ b/selinux-policy/systemd-homed/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE1="selinux-policy"

diff --git a/selinux-policy/systemd-modules-load-and-similar/main.fmf b/selinux-policy/systemd-modules-load-and-similar/main.fmf
index 4fdb6c5..0adedeb 100644
--- a/selinux-policy/systemd-modules-load-and-similar/main.fmf
+++ b/selinux-policy/systemd-modules-load-and-similar/main.fmf
@@ -1,2 +1,60 @@
-path: /selinux-policy/systemd-modules-load-and-similar
-tier: 2
+summary: SELinux interferes with the systemd-modules-load service and related programs
+description: |+
+    SELinux interferes with the systemd-modules-load service and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - initscripts
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - rdma-core
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - openssh-clients
+  - systemd-udev
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - f33friendly
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1358526
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1358960
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1360157
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1360488
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1437153
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1438253
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1490015
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1493293
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1697632
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1698200
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1699559
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1819161
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1823246
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1824196
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1829700
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1833502
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1838933
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1942267
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1972372
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1850953
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7
+    continue: false
+extra-nitrate: TC#0607299
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-modules-load-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/systemd-modules-load-and-similar

diff --git a/selinux-policy/systemd-modules-load-and-similar/runtest.sh b/selinux-policy/systemd-modules-load-and-similar/runtest.sh
index d62bd6f..b7bc865 100755
--- a/selinux-policy/systemd-modules-load-and-similar/runtest.sh
+++ b/selinux-policy/systemd-modules-load-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/systemd-rfkill-and-similar/main.fmf b/selinux-policy/systemd-rfkill-and-similar/main.fmf
index ecc2671..8fb5e1e 100644
--- a/selinux-policy/systemd-rfkill-and-similar/main.fmf
+++ b/selinux-policy/systemd-rfkill-and-similar/main.fmf
@@ -1,5 +1,54 @@
-path: /selinux-policy/systemd-rfkill-and-similar
-tier: 2
+summary: SELinux interferes with systemd-rfkill and related programs
+description: |+
+    SELinux interferes with systemd-rfkill service and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - systemd
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - systemd-udev
+  - initscripts
+  - procps-ng
+  - kernel-modules
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass
+  - Tier2
+  - Tier2se
+  - f32friendly
+  - f33friendly
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1290255
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1309839
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1319499
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1388669
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1543650
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1554838
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1557595
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1638981
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1661724
 adjust:
--   enabled: false
-    when: distro ~>= fedora-32
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7
+    continue: false
+extra-nitrate: TC#0606118
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-rfkill-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/systemd-rfkill-and-similar

diff --git a/selinux-policy/systemd-rfkill-and-similar/runtest.sh b/selinux-policy/systemd-rfkill-and-similar/runtest.sh
index 2d027fb..73addd0 100755
--- a/selinux-policy/systemd-rfkill-and-similar/runtest.sh
+++ b/selinux-policy/systemd-rfkill-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/systemd-sysctl-and-similar/main.fmf b/selinux-policy/systemd-sysctl-and-similar/main.fmf
index 88d805d..1f04ab9 100644
--- a/selinux-policy/systemd-sysctl-and-similar/main.fmf
+++ b/selinux-policy/systemd-sysctl-and-similar/main.fmf
@@ -1,2 +1,38 @@
-path: /selinux-policy/systemd-sysctl-and-similar
-tier: 2
+summary: Does the systemd-sysctl work correctly under SELinux confinement?
+description: |+
+    Does the systemd-sysctl work correctly under SELinux confinement?
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - systemd
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - setools-console
+  - systemd
+  - /usr/sbin/service
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2056207
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2056999
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+extra-nitrate: TC#0613033
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-sysctl-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/systemd-sysctl-and-similar

diff --git a/selinux-policy/systemd-sysctl-and-similar/runtest.sh b/selinux-policy/systemd-sysctl-and-similar/runtest.sh
index 51ec449..d7f0d06 100755
--- a/selinux-policy/systemd-sysctl-and-similar/runtest.sh
+++ b/selinux-policy/systemd-sysctl-and-similar/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/systemd-timesyncd-and-similar/main.fmf b/selinux-policy/systemd-timesyncd-and-similar/main.fmf
index 16bf981..4c90d39 100644
--- a/selinux-policy/systemd-timesyncd-and-similar/main.fmf
+++ b/selinux-policy/systemd-timesyncd-and-similar/main.fmf
@@ -1,2 +1,58 @@
-path: /selinux-policy/systemd-timesyncd-and-similar
-tier: 2
+summary: SELinux interferes with systemd-timesyncd and related programs
+description: |+
+    SELinux interferes with systemd-timesyncd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - systemd
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - systemd-udev
+  - initscripts
+  - systemd-timesyncd
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - TIPpass
+  - TIPpass_Security
+  - Tier2
+  - Tier2se
+  - epel
+  - rhel8-epel
+  - rhel9-epel
+  - targeted
+tier: '2'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1640801
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1649257
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1649668
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1649671
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1653050
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1666222
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1694272
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1822131
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1869979
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1949315
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1970865
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7
+    continue: false
+extra-nitrate: TC#0606395
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-timesyncd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/systemd-timesyncd-and-similar

diff --git a/selinux-policy/systemd-timesyncd-and-similar/runtest.sh b/selinux-policy/systemd-timesyncd-and-similar/runtest.sh
index fab5ec7..886546a 100755
--- a/selinux-policy/systemd-timesyncd-and-similar/runtest.sh
+++ b/selinux-policy/systemd-timesyncd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/systemd-userdbd-and-similar/main.fmf b/selinux-policy/systemd-userdbd-and-similar/main.fmf
index 40c698a..7c41ff7 100644
--- a/selinux-policy/systemd-userdbd-and-similar/main.fmf
+++ b/selinux-policy/systemd-userdbd-and-similar/main.fmf
@@ -1,5 +1,47 @@
-path: /selinux-policy/systemd-userdbd-and-similar
-tier: 2
+summary: SELinux interferes with systemd-userdbd and related programs
+description: |+
+    SELinux interferes with systemd-userdbd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+  - systemd
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - systemd
+  - initscripts
+  - shadow-utils
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - NoRHEL8
+  - failinfedora
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1835630
 adjust:
--   enabled: false
-    when: distro <= rhel-8
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7, rhel-8, rhel-9
+    continue: false
+  - enabled: false
+    when: distro == fedora-30, fedora-31
+    continue: false
+extra-nitrate: TC#0606124
+extra-summary: /CoreOS/selinux-policy/Regression/systemd-userdbd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/systemd-userdbd-and-similar

diff --git a/selinux-policy/systemd-userdbd-and-similar/runtest.sh b/selinux-policy/systemd-userdbd-and-similar/runtest.sh
index 8a439ea..38bf5c6 100755
--- a/selinux-policy/systemd-userdbd-and-similar/runtest.sh
+++ b/selinux-policy/systemd-userdbd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/tlp-and-similar/main.fmf b/selinux-policy/tlp-and-similar/main.fmf
index 3e91f57..cb335dd 100644
--- a/selinux-policy/tlp-and-similar/main.fmf
+++ b/selinux-policy/tlp-and-similar/main.fmf
@@ -1,8 +1,44 @@
-path: /selinux-policy/tlp-and-similar
-summary: SELinux interferes with tlp and related programs
-description: |
-    Test coverage for SELinux AVC issues against tlp and related
-    programs. 
+summary: the service was running as initrc_t or init_t, now it is confined by SELinux
+description: |+
+    SELinux interferes with tlp and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - expect
+  - openssh-clients
+  - tlp
+  - rfkill
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPpass_Security
+  - TierCandidatesFAIL
+  - f33friendly
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1460481
 adjust:
--   enabled: false
-    when: distro < rhel-7
+  - enabled: false
+    when: arch == s390x
+    continue: false
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-9
+    continue: false
+extra-nitrate: TC#0569976
+extra-summary: /CoreOS/selinux-policy/Regression/tlp-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/tlp-and-similar

diff --git a/selinux-policy/tlp-and-similar/runtest.sh b/selinux-policy/tlp-and-similar/runtest.sh
index 6e11025..84e6f4f 100755
--- a/selinux-policy/tlp-and-similar/runtest.sh
+++ b/selinux-policy/tlp-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/usbguard-daemon-and-similar/main.fmf b/selinux-policy/usbguard-daemon-and-similar/main.fmf
index 1b207f2..05ea354 100644
--- a/selinux-policy/usbguard-daemon-and-similar/main.fmf
+++ b/selinux-policy/usbguard-daemon-and-similar/main.fmf
@@ -1,5 +1,47 @@
-path: /selinux-policy/usbguard-daemon-and-similar
-tier: 2
+summary: SELinux interferes with usbguard and related programs
+description: |+
+    SELinux interferes with usbguard and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - usbguard
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - initscripts
+  - usbguard
+  - usbguard-selinux
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - TIPpass
+  - f33friendly
+  - fedora-wanted
+  - targeted
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1808527
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1840265
 adjust:
--   enabled: false
-    when: distro < rhel-7
+  - enabled: false
+    when: arch == s390x
+    continue: false
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7
+    continue: false
+extra-nitrate: TC#0606079
+extra-summary: /CoreOS/selinux-policy/Regression/usbguard-daemon-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/usbguard-daemon-and-similar

diff --git a/selinux-policy/usbguard-daemon-and-similar/runtest.sh b/selinux-policy/usbguard-daemon-and-similar/runtest.sh
index ea2c953..a23c68f 100755
--- a/selinux-policy/usbguard-daemon-and-similar/runtest.sh
+++ b/selinux-policy/usbguard-daemon-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

diff --git a/selinux-policy/usbmuxd-and-similar/main.fmf b/selinux-policy/usbmuxd-and-similar/main.fmf
index 9c8cf66..ef0e7e3 100644
--- a/selinux-policy/usbmuxd-and-similar/main.fmf
+++ b/selinux-policy/usbmuxd-and-similar/main.fmf
@@ -1,2 +1,53 @@
-path: /selinux-policy/usbmuxd-and-similar
-tier: 2
+summary: SELinux interferes with usbmuxd and related programs
+description: |+
+    SELinux interferes with usbmuxd and related programs.
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+  - selinux-policy
+require:
+  - library(selinux-policy/common)
+recommend:
+  - audit
+  - libselinux
+  - libselinux-utils
+  - policycoreutils
+  - selinux-policy
+  - selinux-policy-targeted
+  - setools-console
+  - usbmuxd
+  - initscripts
+environment:
+    AVC_ERROR: +no_avc_check
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - TIPpass_Security
+  - Tier3
+  - Tier3se
+  - TipWaived7
+  - f31friendly
+  - f32friendly
+  - targeted
+tier: '3'
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1521054
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1582205
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1930992
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1936705
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1959747
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1965411
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973886
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6
+    continue: false
+  - enabled: false
+    when: arch == aarch64, s390x
+    continue: false
+extra-nitrate: TC#0300434
+extra-summary: /CoreOS/selinux-policy/Regression/usbmuxd-and-similar
+extra-task: /CoreOS/selinux-policy/Regression/usbmuxd-and-similar

diff --git a/selinux-policy/usbmuxd-and-similar/runtest.sh b/selinux-policy/usbmuxd-and-similar/runtest.sh
index c3c4c24..f96d253 100755
--- a/selinux-policy/usbmuxd-and-similar/runtest.sh
+++ b/selinux-policy/usbmuxd-and-similar/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="selinux-policy"

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-11 13:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 13:19 [tests/selinux] pr775-checkpolicy-revdeps: convert metadata of all selinux-policy tests to TMT/FMF Milos Malik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox