diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 5ac9fdb..a33ec0c 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -7,4 +7,5 @@ rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier2.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
 
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..42849bf
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,7 @@
+summary: Internal Tier1 beakerlib tests
+discover:
+    how: fmf
+    url: git://pkgs.devel.redhat.com/tests/httpd
+    filter: 'tier: 1'
+execute:
+    how: tmt
diff --git a/plans/tier1.fmf b/plans/tier1-public.fmf
similarity index 72%
rename from plans/tier1.fmf
rename to plans/tier1-public.fmf
index 3aa33db..c181caa 100644
--- a/plans/tier1.fmf
+++ b/plans/tier1-public.fmf
@@ -1,4 +1,4 @@
-summary: CI plan with Tier1 beakerlib tests
+summary: Public (Fedora) Tier1 beakerlib tests
 discover:
     how: fmf
     url: https://src.fedoraproject.org/tests/httpd.git
diff --git a/plans/tier2-internal.fmf b/plans/tier2-internal.fmf
new file mode 100644
index 0000000..70016ed
--- /dev/null
+++ b/plans/tier2-internal.fmf
@@ -0,0 +1,7 @@
+summary: Internal Tier2 beakerlib tests
+discover:
+    how: fmf
+    url: git://pkgs.devel.redhat.com/tests/httpd
+    filter: 'tier: 2'
+execute:
+    how: tmt