diff --git a/tests/02-compile-arm-ports-01/Makefile b/tests/02-compile-arm-ports-01/Makefile
index c78ed1714..51b232173 100644
--- a/tests/02-compile-arm-ports-01/Makefile
+++ b/tests/02-compile-arm-ports-01/Makefile
@@ -31,6 +31,10 @@ dev/leds/srf06-cc26xx:BOARD=launchpad/cc1310 \
 dev/leds/srf06-cc26xx:BOARD=launchpad/cc1350 \
 dev/leds/srf06-cc26xx:BOARD=launchpad/cc2650 \
 6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
+mqtt-client/srf06-cc26xx:BOARD=srf06/cc26xx \
+mqtt-client/srf06-cc26xx:BOARD=launchpad/cc2650 \
+mqtt-client/srf06-cc26xx:BOARD=sensortag/cc2650 \
+mqtt-client/cc2538dk \
 storage/cfs-coffee/cc2538dk \
 sensniff/cc2538dk \
 rpl-udp/cc2538dk \
@@ -41,7 +45,6 @@ multicast/cc2538dk \
 dev/gpio-hal/cc2538dk \
 dev/leds/cc2538dk \
 platform-specific/cc2538-common/cc2538dk \
-platform-specific/cc2538-common/mqtt-demo/cc2538dk \
 platform-specific/cc2538-common/crypto/cc2538dk \
 platform-specific/cc2538-common/pka/cc2538dk \
 hello-world/cc2538dk \
diff --git a/tests/03-compile-arm-ports-02/Makefile b/tests/03-compile-arm-ports-02/Makefile
index c0f1b7704..a69ec44a0 100644
--- a/tests/03-compile-arm-ports-02/Makefile
+++ b/tests/03-compile-arm-ports-02/Makefile
@@ -4,7 +4,6 @@ TOOLSDIR=../../tools
 EXAMPLES = \
 rpl-border-router/zoul \
 platform-specific/cc2538-common/zoul \
-platform-specific/cc2538-common/mqtt-demo/zoul \
 platform-specific/cc2538-common/crypto/zoul \
 platform-specific/cc2538-common/pka/zoul \
 platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \
@@ -51,6 +50,8 @@ dev/rgb-led/zoul:BOARD=remote-revb \
 dev/rgb-led/zoul:BOARD=firefly-reva \
 dev/rgb-led/zoul:BOARD=firefly \
 dev/rgb-led/zoul:BOARD=orion \
+mqtt-client/zoul:BOARD=firefly \
+mqtt-client/openmote-cc2538 \
 storage/cfs-coffee/openmote-cc2538 \
 sensniff/openmote-cc2538 \
 hello-world/openmote-cc2538 \