diff --git a/main.fmf b/main.fmf
index 2b8a07d..77ff3cd 100644
--- a/main.fmf
+++ b/main.fmf
@@ -5,7 +5,9 @@ duration: 5m
 #contact: Petr Lautrbach <plautrba@redhat.com>
 #requires: [policycoreutils, libselinux-utils]
 
-tags: [generic]
+tag:
+  - rhel
+  - fedora
 
 /checkpolicy:
     component: checkpolicy
diff --git a/policycoreutils/linux-system-roles.selinux-tests/main.fmf b/policycoreutils/linux-system-roles.selinux-tests/main.fmf
index df9c7a2..e546d73 100644
--- a/policycoreutils/linux-system-roles.selinux-tests/main.fmf
+++ b/policycoreutils/linux-system-roles.selinux-tests/main.fmf
@@ -1,2 +1,3 @@
 path: /policycoreutils/linux-system-roles.selinux-tests
-tags: [fedora]
+tag-:
+  - rhel
diff --git a/selinux-policy/systemd-bootchart-and-similar/main.fmf b/selinux-policy/systemd-bootchart-and-similar/main.fmf
index b0d45b8..494b668 100644
--- a/selinux-policy/systemd-bootchart-and-similar/main.fmf
+++ b/selinux-policy/systemd-bootchart-and-similar/main.fmf
@@ -1,3 +1,4 @@
 path: /selinux-policy/systemd-bootchart-and-similar
 tier: 2
-
+tag-:
+  - rhel