diff --git a/include/functions b/include/functions
index c88674ba..2bb82eae 100644
--- a/include/functions
+++ b/include/functions
@@ -2670,7 +2670,15 @@
         fi
 
         # Check for correct hardware platform
-        if [ ${SKIPTEST} -eq 0 -a -n "${TEST_NEED_PLATFORM}" -a ! "${HARDWARE}" = "${TEST_NEED_PLATFORM}" ]; then SKIPTEST=1; SKIPREASON="Incorrect hardware platform"; fi
+        if [ ${SKIPTEST} -eq 0 -a -n "${TEST_NEED_PLATFORM}" ]; then
+            HASMATCH=0
+            for I in ${TEST_NEED_PLATFORM}; do
+                if [ "${I}" = "${HARDWARE}" ]; then HASMATCH=1; fi
+            done
+            if [ ${HASMATCH} -eq 0 ]; then
+                SKIPTEST=1; SKIPREASON="Incorrect hardware platform (${TEST_NEED_PLATFORM} only)"
+            fi
+        fi
 
         # Check for required (and discovered) package manager
         if [ ${SKIPTEST} -eq 0 -a ${TEST_NEED_PKG_MGR} -eq 1 -a ${HAS_PACKAGE_MANAGER} -eq 0 ]; then SKIPTEST=1; SKIPREASON="Requires a known package manager to test presence of a particular package"; fi