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 648918d..edd5091 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,4 +3,4 @@ product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/libpsl-all-internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..39c8e1a
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,7 @@
+# libpsl uses publicsuffix-list in its test suite, so use it to verify
+# publicsuffix-list as well
+/libpsl-all-internal:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/libpsl
+      name: /plans/all
diff --git a/plans/tests.fmf b/plans/tests.fmf
deleted file mode 100644
index db5d8f8..0000000
--- a/plans/tests.fmf
+++ /dev/null
@@ -1,19 +0,0 @@
-summary:
-    Run tests from the libpsl repository
-
-discover:
-    how: fmf
-    url: git://pkgs.devel.redhat.com/rpms/libpsl
-    ref: rhel-8.6.0
-
-prepare:
-    - name: data
-      how: install
-      package: publicsuffix-list
-
-    - name: bin
-      how: shell
-      script: dnf install -y --enablerepo=rhel-buildroot psl
-
-execute:
-    how: tmt