diff --git a/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc b/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc
index 0c40d967d9..ba511b9ed5 100644
--- a/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc
+++ b/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc
@@ -7,6 +7,7 @@
 # ptests which take less than ~30s each
 
 PTESTS_FAST_META_MULTIMEDIA = "\
+    crossguid \
     gssdp \
     gupnp-av \
     gupnp-igd \
diff --git a/meta-multimedia/recipes-support/crossguid/crossguid/run-ptest b/meta-multimedia/recipes-support/crossguid/crossguid/run-ptest
new file mode 100644
index 0000000000..9e058f8925
--- /dev/null
+++ b/meta-multimedia/recipes-support/crossguid/crossguid/run-ptest
@@ -0,0 +1,10 @@
+#!/bin/sh
+RET=0
+cd tests
+if ./crossguid-test; then
+  echo PASS: crossguid-test
+else
+  echo FAIL: crossguid-test
+  RET=1
+fi
+exit $RET
diff --git a/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb b/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb
index 811a876885..48673cddcd 100644
--- a/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb
+++ b/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb
@@ -9,11 +9,16 @@ DEPENDS += "util-linux"
 
 SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681"
 SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master \
+           file://run-ptest \
            file://0001-include-missing-cstdint.patch"
 
 
-inherit cmake
+inherit cmake ptest
 
 do_install:append() {
     sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${datadir}/crossguid/cmake/crossguid-config.cmake
 }
+
+do_install_ptest() {
+    install -D ${B}/crossguid-test ${D}${PTEST_PATH}/tests/crossguid-test
+}