diff --git a/openmp-rpm/main.fmf b/openmp-rpm/main.fmf
index df4fc35..e899916 100644
--- a/openmp-rpm/main.fmf
+++ b/openmp-rpm/main.fmf
@@ -15,13 +15,22 @@ adjust:
   - because: "libomp not supported in s390x"
     when: arch == s390x
     enabled: false
+    continue: false
 
   - because: "Use yum in RHEL < 8"
     require+:
       - yum-utils
     environment+:
       BUILDDEP_CMD: "yum-builddep"
-    when: distro < rhel-8
+    when: distro == rhel and distro < rhel-8
+
+  - because: "Use dnf5 in Fedora 39+"
+    require+:
+      - dnf5-plugins
+    environment+:
+      BUILDDEP_CMD: "dnf builddep"
+    continue: false
+    when: distro == fedora and distro >= fedora-39
 
   - because: "Use dnf in RHEL >= 8, Fedora and CentOS"
     require+:
diff --git a/openmp-rpm/runtest.sh b/openmp-rpm/runtest.sh
index 37647fe..86ec074 100755
--- a/openmp-rpm/runtest.sh
+++ b/openmp-rpm/runtest.sh
@@ -3,4 +3,4 @@
 set -ex
 
 ${BUILDDEP_CMD} -y test.spec
-rpmbuild --define '_sourcedir .' --define '_builddir .' -bb test.spec
+QA_RPATHS=$(( 0x0001 )) rpmbuild --define '_sourcedir .' --define '_builddir .' -bb test.spec