diff --git a/libsemanage/sanity-tests/main.fmf b/libsemanage/sanity-tests/main.fmf
index 9c7a7e1..1bb45d1 100644
--- a/libsemanage/sanity-tests/main.fmf
+++ b/libsemanage/sanity-tests/main.fmf
@@ -1 +1,47 @@
-path: /libsemanage/sanity-tests
+summary: Test libsemanage functions
+description: ''
+contact: Milos Malik <mmalik@redhat.com>
+component:
+- libsemanage
+recommend:
+- libsemanage
+- libsemanage-devel
+- gcc
+- CUnit
+- CUnit-devel
+- checkpolicy
+- policycoreutils-python-utils
+duration: 60m
+enabled: true
+tag:
+- CI-Tier-1
+- NoRHEL4
+- NoRHEL5
+- TIPfail_Security
+- Tier1
+- Tier1se
+- f31friendly
+- f32friendly
+- notip
+- rhel8-buildroot
+- rhel8-crb
+- rhel9-buildroot
+- targeted
+tier: '1'
+link:
+-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1642305
+-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1781097
+-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1636973
+adjust:
+-   enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+-   enabled: false
+    when: distro == rhel-7 and arch == s390x
+    continue: false
+-   enabled: false
+    when: distro == rhel-alt-7 and arch == s390x
+    continue: false
+extra-nitrate: TC#0547810
+extra-summary: /CoreOS/libsemanage/Sanity/sanity-tests
+extra-task: /CoreOS/libsemanage/Sanity/sanity-tests
diff --git a/libsemanage/sanity-tests/runtest.sh b/libsemanage/sanity-tests/runtest.sh
index 0b1785b..ba1931e 100755
--- a/libsemanage/sanity-tests/runtest.sh
+++ b/libsemanage/sanity-tests/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="libsemanage"
diff --git a/libsemanage/usepasswd-in-semanage-conf/main.fmf b/libsemanage/usepasswd-in-semanage-conf/main.fmf
index 7cd455b..f0a048d 100644
--- a/libsemanage/usepasswd-in-semanage-conf/main.fmf
+++ b/libsemanage/usepasswd-in-semanage-conf/main.fmf
@@ -1,6 +1,32 @@
-path: /libsemanage/usepasswd-in-semanage-conf
 summary: Make sure usepasswd option in semanage.conf works properly
-tier: 2
+description: |+
+    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1871786
+
+    Make sure usepasswd option in semanage.conf works properly
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+- libsemanage
+recommend:
+- libselinux
+- libselinux-utils
+- libsemanage
+- policycoreutils
+- policycoreutils-python-utils
+- selinux-policy
+- selinux-policy-devel
+duration: 10m
+enabled: true
+tag:
+- NoRHEL4
+- NoRHEL5
+- targeted
+link:
+-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1871786
 adjust:
 -   enabled: false
-    when: distro < rhel-7
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0609005
+extra-summary: /CoreOS/libsemanage/Sanity/usepasswd-in-semanage-conf
+extra-task: /CoreOS/libsemanage/Sanity/usepasswd-in-semanage-conf
diff --git a/libsemanage/verify-options-in-semanage-conf/main.fmf b/libsemanage/verify-options-in-semanage-conf/main.fmf
index 9444a6c..c31d489 100644
--- a/libsemanage/verify-options-in-semanage-conf/main.fmf
+++ b/libsemanage/verify-options-in-semanage-conf/main.fmf
@@ -1,12 +1,39 @@
-path: /libsemanage/verify-options-in-semanage-conf
 summary: Are the verify options in semanage.conf honored?
-description: |
+description: |+
     Are the verify options in semanage.conf honored?
     Tested options: verify kernel, verify module, verify linked
     Tested tools: semodule, semanage
     Positive and negative cases are tested.
     Original information found at http://selinuxproject.org/page/PolicyValidate
-tier: 1
+
+contact: Milos Malik <mmalik@redhat.com>
+component:
+- libsemanage
+recommend:
+- libselinux
+- libselinux-utils
+- libsemanage
+- policycoreutils
+- policycoreutils-python
+- selinux-policy
+- selinux-policy-devel
+duration: 10m
+enabled: true
+tag:
+- CI-Tier-1
+- NoRHEL4
+- NoRHEL5
+- TIPpass_Security
+- TierCandidatesFAIL
+- f32friendly
+- f33friendly
+- targeted
+link:
+-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1400705
 adjust:
 -   enabled: false
-    when: distro < rhel-6
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0540246
+extra-summary: /CoreOS/libsemanage/Sanity/verify-options-in-semanage-conf
+extra-task: /CoreOS/libsemanage/Sanity/verify-options-in-semanage-conf
diff --git a/libsemanage/verify-options-in-semanage-conf/runtest.sh b/libsemanage/verify-options-in-semanage-conf/runtest.sh
index c7891f3..d17ed44 100755
--- a/libsemanage/verify-options-in-semanage-conf/runtest.sh
+++ b/libsemanage/verify-options-in-semanage-conf/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="libsemanage"
diff --git a/plans/fedora.fmf b/plans/fedora.fmf
index 334f962..a97b2a9 100644
--- a/plans/fedora.fmf
+++ b/plans/fedora.fmf
@@ -2,7 +2,7 @@ summary:
     Run all available tests
 discover:
     how: fmf
-    filter: component:libsepol
+    filter: component:libsemanage
     #modified-only: True
     #modified-url: https://src.fedoraproject.org/tests/selinux/
     #modified-ref: reference/master