diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
index dfa314b..939406f 100644
--- a/plans/tier1-internal.fmf
+++ b/plans/tier1-internal.fmf
@@ -2,7 +2,7 @@ summary: Internal Tier1 beakerlib tests
 discover:
     how: fmf
     url: https://gitlab.com/redhat/rhel/tests/httpd.git
-    filter: 'tier: 1'
+    filter: "tier:1&component:httpd"
 execute:
     how: tmt
 adjust:
diff --git a/plans/tier2-internal.fmf b/plans/tier2-internal.fmf
index 4ea8fed..9242578 100644
--- a/plans/tier2-internal.fmf
+++ b/plans/tier2-internal.fmf
@@ -2,7 +2,7 @@ summary: Internal Tier2 beakerlib tests
 discover:
     how: fmf
     url: https://gitlab.com/redhat/rhel/tests/httpd.git
-    filter: 'tier: 2'
+    filter: "tier:2&component:httpd"
 execute:
     how: tmt
 adjust:
diff --git a/plans/tier3-internal.fmf b/plans/tier3-internal.fmf
index 7708554..c4e3a21 100644
--- a/plans/tier3-internal.fmf
+++ b/plans/tier3-internal.fmf
@@ -2,7 +2,7 @@ summary: Internal Tier3 beakerlib tests
 discover:
     how: fmf
     url: https://gitlab.com/redhat/rhel/tests/httpd.git
-    filter: 'tier: 3'
+    filter: "tier:3&component:httpd"
 execute:
     how: tmt
 adjust: