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 305102e..daad873 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,7 +4,7 @@ product_versions:
 decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
 
 #Rawhide
 --- !Policy
@@ -13,7 +13,7 @@ product_versions:
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
 
 #gating rhel
 --- !Policy
@@ -24,3 +24,5 @@ rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
diff --git a/plans/all.fmf b/plans/public.fmf
similarity index 61%
rename from plans/all.fmf
rename to plans/public.fmf
index 12606c2..c745bce 100644
--- a/plans/all.fmf
+++ b/plans/public.fmf
@@ -1,4 +1,4 @@
-summary: Test plan with cups tests
+summary: Test plan that runs all tests from cups tests repo.
 discover:
     how: fmf
     url: https://src.fedoraproject.org/tests/cups.git
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..eb36c80
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,12 @@
+summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/cups
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-* or distro == fedora-*
+    because: They don't have access to internal repos.