diff --git a/include/tests_ports_packages b/include/tests_ports_packages
index 8cc9cb78..212f622a 100644
--- a/include/tests_ports_packages
+++ b/include/tests_ports_packages
@@ -462,20 +462,24 @@
     if [ ! "${DNFBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no "PKGS-7354" --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking package database integrity"
     if [ ${SKIPTEST} -eq 0 ]; then
-        # Check for security updates
-        LogText "Action: checking integrity of package database"
-        FIND=`${DNFBINARY} -q repoquery --duplicated`
+        # Check if repoquery plugin is available
+        FIND=`${DNFBINARY} 2>&1 | grep "^repoquery"`
         if [ ! "${FIND}" = "" ]; then
-            Logtext "Result: found unexpected result on repoquery --duplicated"
-            ReportSuggestion "${TEST_NO}" "Check output of: dnf repoquery --duplicated"
-        fi
-        FIND=`${DNFBINARY} -q repoquery --unsatisfied`
-        if [ ! "${FIND}" = "" ]; then
-            Logtext "Result: found unexpected result on repoquery --unsatisfied"
-            ReportSuggestion "${TEST_NO}" "Check output of: dnf repoquery --unsatisfied"
+            LogText "Action: checking integrity of package database"
+            FIND=`${DNFBINARY} -q repoquery --duplicated`
+            if [ ! "${FIND}" = "" ]; then
+                LogText "Result: found unexpected result on repoquery --duplicated"
+                ReportSuggestion "${TEST_NO}" "Check output of: dnf repoquery --duplicated"
+            fi
+            FIND=`${DNFBINARY} -q repoquery --unsatisfied`
+            if [ ! "${FIND}" = "" ]; then
+                LogText "Result: found unexpected result on repoquery --unsatisfied"
+                ReportSuggestion "${TEST_NO}" "Check output of: dnf repoquery --unsatisfied"
+            fi
+          else
+            LogText "Result: repoquery plugin not installed."
         fi
     fi
-
 #
 #################################################################################
 #