diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
index 8d9ead6..b352c3e 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,7 +5,7 @@ product_versions:
 decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1/centos.functional}
 
 # gating rawhide
 --- !Policy
@@ -14,14 +14,14 @@ product_versions:
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1/centos.functional}
 
 # gating rhel
 --- !Policy
 product_versions:
-  - rhel-9
-  - rhel-10
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier2.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1/centos.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier2/centos.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build./plans/tier1/rhel.functional}
diff --git a/plans/README.md b/plans/README.md
new file mode 100644
index 0000000..ff52256
--- /dev/null
+++ b/plans/README.md
@@ -0,0 +1,5 @@
+This directory contains test plans for libpq, structured in 2 tiers.
+
+To manually run the tests, use:
+tmt -c distro=rhel9 run -avvv --skip finish plan --name tier2 execute --how tmt --interactive test --name . provision --how minute --image rhel9 login prepare -h shell --script 'dnf config-manager --set-enabled beaker-tasks'
+(rhel9 can be replace for rhel10 or other and plan --name for tier1)
diff --git a/plans/tier1.fmf b/plans/tier1.fmf
new file mode 100644
index 0000000..0d585a7
--- /dev/null
+++ b/plans/tier1.fmf
@@ -0,0 +1,27 @@
+/centos:
+  summary: Tier 1 tests for libpq
+  discover:
+  - name: libpq
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://gitlab.com/redhat/centos-stream/tests/libpq.git"
+  - name: python-psycopg2
+    how: fmf
+    filter: 'tier: 1'
+    url: https://gitlab.com/redhat/centos-stream/tests/python-psycopg2.git
+  execute:
+    how: tmt
+
+/rhel:
+  summary: Internal tier 1 tests for libpq
+  discover:
+  - name: libpq
+    how: fmf
+    filter: 'tier: 1'
+    url: https://pkgs.devel.redhat.com/cgit/tests/libpq
+  - name: python-psycopg2
+    how: fmf
+    filter: 'tier: 1'
+    url: https://pkgs.devel.redhat.com/cgit/tests/python-psycopg2
+  execute:
+    how: tmt
diff --git a/plans/tier2.fmf b/plans/tier2.fmf
new file mode 100644
index 0000000..5261b68
--- /dev/null
+++ b/plans/tier2.fmf
@@ -0,0 +1,30 @@
+/centos:
+  summary: Tier 2,3  tests for libpq
+  discover:
+  - name: libpq
+    how: fmf
+    filter: '(tier: 2 | tier: 3)'
+    url: https://gitlab.com/redhat/centos-stream/tests/libpq.git
+  - name: python-psycopg2
+    how: fmf
+    filter: '(tier: 2 | tier: 3)'
+    url: https://gitlab.com/redhat/centos-stream/tests/python-psycopg2.git
+  execute:
+    how: tmt
+
+/rhel:
+  summary: Internal tier 2,3 tests for libpq
+  discover:
+  - name: libpq
+    how: fmf
+    filter: '(tier: 2 | tier: 3)'
+    url: https://pkgs.devel.redhat.com/cgit/tests/libpq
+  - name: python-psycopg2
+    how: fmf
+    filter: '(tier: 2 | tier: 3)'
+    url: https://pkgs.devel.redhat.com/cgit/tests/python-psycopg2
+  adjust:
+    enabled: false
+    when: distro == centos-stream
+  execute:
+    how: tmt