diff --git a/plans/matrix.fmf b/plans/matrix.fmf
new file mode 100644
index 0000000..84270c8
--- /dev/null
+++ b/plans/matrix.fmf
@@ -0,0 +1,28 @@
+summary: Basic smoke test
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/postgresql-jdbc.git
+execute:
+  how: tmt
+
+prepare:
+  - how: install
+    package: java-21-openjdk-headless
+
+/postgresql-16:
+  prepare+:
+    - how: install
+      package:
+        - postgresql16-server
+        - postgresql16-contrib
+        - postgresql-test-rpm-macros
+
+# There is no version 17
+
+/postgresql-18:
+  prepare+:
+    - how: install
+      package:
+        - postgresql18-server
+        - postgresql18-contrib
+        - postgresql18-test-rpm-macros
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
deleted file mode 100644
index e753eda..0000000
--- a/plans/smoke.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: Basic smoke test
-discover:
-  how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/postgresql-jdbc.git
-execute:
-  how: tmt
-prepare:
-  - how: install
-    package: java-21-openjdk-headless