diff --git a/include/tests_ssh b/include/tests_ssh
index 05c75d8d..8b000e24 100644
--- a/include/tests_ssh
+++ b/include/tests_ssh
@@ -46,7 +46,8 @@
             # Store settings in a temporary file
             CreateTempFile
             SSH_DAEMON_OPTIONS_FILE="${TEMP_FILE}"
-            ${SSHDBINARY} -T 2> /dev/null > ${SSH_DAEMON_OPTIONS_FILE}
+            # Use a non-existing user, to ensure that systems that have a Match block configured, will be evaluated as well
+            ${SSHDBINARY} -T sshd-C user=doesnotexist,host=none,addr=none 2> /dev/null > ${SSH_DAEMON_OPTIONS_FILE}
         else
             Display --indent 2 --text "- Checking running SSH daemon" --result "${STATUS_NOT_FOUND}" --color WHITE
         fi