diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg/run-ptest b/meta-networking/recipes-connectivity/nanomsg/nanomsg/run-ptest
new file mode 100644
index 0000000000..447867aedb
--- /dev/null
+++ b/meta-networking/recipes-connectivity/nanomsg/nanomsg/run-ptest
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+RET=0
+cd tests
+
+for t in $(ls *); do
+    ./$t
+    if [ $? -eq 0 ]; then
+        echo PASS: $t
+    else
+        echo FAIL: $t
+        RET=1
+    fi
+done
+
+exit $RET
diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb
index 10ae7a61d7..f291326c80 100644
--- a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb
+++ b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.2.bb
@@ -10,19 +10,32 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755"
 SECTION = "libs/networking"
 
 SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master \
+           file://run-ptest \
           "
 
 SRCREV = "ccd7f20c1b756f7041598383baffcdc326246db7"
 
-inherit cmake pkgconfig
+inherit cmake pkgconfig ptest
 
 # nanomsg documentation generation requires asciidoctor,
 # not asciidoc, and currently there's no asciidoctor-native
 # recipe anywhere in openembedded-core or meta-openembedded
-EXTRA_OECMAKE = " -DNN_ENABLE_DOC=OFF "
+EXTRA_OECMAKE = " -DNN_ENABLE_DOC=OFF \
+                  ${@bb.utils.contains('PTEST_ENABLED', '1', '-DNN_TESTS=ON', '', d)} \
+                "
 
 # we don't want nanomsg-tools to be renamed to libnanomsg-tools
 DEBIAN_NOAUTONAME:${PN}-tools = "1"
 
+do_install_ptest(){
+    install -d ${D}/${PTEST_PATH}/tests
+    find ${B} -maxdepth 1 -type f -executable \
+        ! -name "*_lat" \
+        ! -name "*_thr" \
+        ! -name "nanocat" \
+        ! -name "libnanomsg.so*" \
+        -exec install {} ${D}${PTEST_PATH}/tests/ \;
+}
+
 PACKAGES =+ "${PN}-tools"
 FILES:${PN}-tools = "${bindir}/*"