diff --git a/plans/revdep.fmf b/plans/revdep.fmf
new file mode 100644
index 0000000..30cc001
--- /dev/null
+++ b/plans/revdep.fmf
@@ -0,0 +1,10 @@
+summary: Reverse dependency tests
+discover:
+    how: fmf
+execute:
+    how: dependency
+    components:
+        - perl-Future-AsyncAwait
+        - perl-Object-Pad
+        - perl-Syntax-Keyword-Defer
+        - perl-Syntax-Keyword-Dynamically
diff --git a/tests/revdep-tests/perl-Future-AsyncAwait.fmf b/tests/revdep-tests/perl-Future-AsyncAwait.fmf
deleted file mode 100644
index ac2b8bc..0000000
--- a/tests/revdep-tests/perl-Future-AsyncAwait.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fedora CI does not support automatic testing of reverse dependencies. Hence
-# list the dependencies here explicitly.
-# We cannot link the tests via FMF plan uri because it would hard-code Fedora
-# dist-git domain name (ugly) and dist-git branch (does not survive branching).
-summary: Reverse dependency tests
-component: perl-Future-AsyncAwait
-require: perl-Future-AsyncAwait-tests
-test: /usr/libexec/perl-Future-AsyncAwait/test
diff --git a/tests/revdep-tests/perl-Object-Pad.fmf b/tests/revdep-tests/perl-Object-Pad.fmf
deleted file mode 100644
index a2e72d2..0000000
--- a/tests/revdep-tests/perl-Object-Pad.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fedora CI does not support automatic testing of reverse dependencies. Hence
-# list the dependencies here explicitly.
-# We cannot link the tests via FMF plan uri because it would hard-code Fedora
-# dist-git domain name (ugly) and dist-git branch (does not survive branching).
-summary: Reverse dependency tests
-component: perl-Object-Pad
-require: perl-Object-Pad-tests
-test: /usr/libexec/perl-Object-Pad/test
diff --git a/tests/revdep-tests/perl-Syntax-Keyword-Defer.fmf b/tests/revdep-tests/perl-Syntax-Keyword-Defer.fmf
deleted file mode 100644
index a94c22b..0000000
--- a/tests/revdep-tests/perl-Syntax-Keyword-Defer.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fedora CI does not support automatic testing of reverse dependencies. Hence
-# list the dependencies here explicitly.
-# We cannot link the tests via FMF plan uri because it would hard-code Fedora
-# dist-git domain name (ugly) and dist-git branch (does not survive branching).
-summary: Reverse dependency tests
-component: perl-Syntax-Keyword-Defer
-require: perl-Syntax-Keyword-Defer-tests
-test: /usr/libexec/perl-Syntax-Keyword-Defer/test
diff --git a/tests/revdep-tests/perl-Syntax-Keyword-Dynamically.fmf b/tests/revdep-tests/perl-Syntax-Keyword-Dynamically.fmf
deleted file mode 100644
index 5e19a4c..0000000
--- a/tests/revdep-tests/perl-Syntax-Keyword-Dynamically.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fedora CI does not support automatic testing of reverse dependencies. Hence
-# list the dependencies here explicitly.
-# We cannot link the tests via FMF plan uri because it would hard-code Fedora
-# dist-git domain name (ugly) and dist-git branch (does not survive branching).
-summary: Reverse dependency tests
-component: perl-Syntax-Keyword-Dynamically
-require: perl-Syntax-Keyword-Dynamically-tests
-test: /usr/libexec/perl-Syntax-Keyword-Dynamically/test