diff --git a/.travis.yml b/.travis.yml
index 8426ff5e7..fb01368c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,14 +80,14 @@ script:
 env:
   ## This magically kick-off parallel jobs for each of the for the sets
   ## of environment variable defined below
-  - BUILD_TYPE='doxygen' BUILD_CATEGORY='doxygen'
   - BUILD_TYPE='compile-base' BUILD_CATEGORY='compile' BUILD_ARCH='msp430'
-  - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
+  - BUILD_TYPE='compile-arm-ports-01' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
+  - BUILD_TYPE='compile-arm-ports-02' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
   - BUILD_TYPE='compile-nxp-ports' BUILD_CATEGORY='compile' BUILD_ARCH='jn516x'
-  - BUILD_TYPE='compile-nrf52-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
   - BUILD_TYPE='compile-tools' BUILD_CATEGORY='compile'
   - BUILD_TYPE='rpl-lite' BUILD_CATEGORY='sim'
   - BUILD_TYPE='rpl-classic' BUILD_CATEGORY='sim'
+  - BUILD_TYPE='tun-rpl-br' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
   - BUILD_TYPE='simulation-base' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
   - BUILD_TYPE='ieee802154' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='tun-rpl-br' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
+  - BUILD_TYPE='doxygen' BUILD_CATEGORY='doxygen'
diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports-01/Makefile
similarity index 61%
rename from tests/02-compile-arm-ports/Makefile
rename to tests/02-compile-arm-ports-01/Makefile
index 78487d754..7b83165cf 100644
--- a/tests/02-compile-arm-ports/Makefile
+++ b/tests/02-compile-arm-ports-01/Makefile
@@ -11,10 +11,12 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
 platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
 platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
 platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
-hello-world/cc2538dk \
-rpl-border-router/cc2538dk \
 rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \
-rpl-border-router/zoul \
+sensniff/srf06-cc26xx \
+sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
+6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
+storage/cfs-coffee/cc2538dk \
+sensniff/cc2538dk \
 rpl-udp/cc2538dk \
 coap/cc2538dk \
 slip-radio/cc2538dk \
@@ -24,39 +26,15 @@ platform-specific/cc2538-common/cc2538dk \
 platform-specific/cc2538-common/mqtt-demo/cc2538dk \
 platform-specific/cc2538-common/crypto/cc2538dk \
 platform-specific/cc2538-common/pka/cc2538dk \
-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 \
-coap/zoul \
-ipso-objects/zoul \
-hello-world/zoul \
-sensniff/cc2538dk \
-sensniff/openmote-cc2538 \
-sensniff/zoul \
-sensniff/zoul:ZOUL_CONF_SUB_GHZ_SNIFFER=1 \
-sensniff/srf06-cc26xx \
-sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
-storage/cfs-coffee/cc2538dk \
-storage/cfs-coffee/openmote-cc2538 \
-storage/cfs-coffee/zoul \
-storage/antelope-shell/zoul \
-6tisch/simple-node/zoul \
-6tisch/simple-node/zoul:MAKE_WITH_ORCHESTRA=1 \
-6tisch/simple-node/zoul:MAKE_WITH_SECURITY=1 \
-libs/logging/zoul \
-6tisch/etsi-plugtest-2017/zoul:BOARD=remote \
-6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
-6tisch/6p-packet/zoul \
-6tisch/sixtop/zoul \
-http-socket/zoul \
-libs/timers/zoul \
-libs/energest/zoul \
-libs/trickle-library/zoul \
-nullnet/zoul \
-slip-radio/zoul \
-
+hello-world/cc2538dk \
+rpl-border-router/cc2538dk \
+hello-world/nrf52dk \
+platform-specific/nrf52dk/coap-demo/nrf52dk:coap-server \
+platform-specific/nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
+platform-specific/nrf52dk/mqtt-demo/nrf52dk \
+platform-specific/nrf52dk/blink-hello/nrf52dk \
+platform-specific/nrf52dk/timer-test/nrf52dk \
+libs/logging/nrf52dk
 
 TOOLS=
 
diff --git a/tests/03-compile-arm-ports-02/Makefile b/tests/03-compile-arm-ports-02/Makefile
new file mode 100644
index 000000000..62b0ad084
--- /dev/null
+++ b/tests/03-compile-arm-ports-02/Makefile
@@ -0,0 +1,39 @@
+EXAMPLESDIR=../../examples
+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 \
+coap/zoul \
+ipso-objects/zoul \
+hello-world/zoul \
+sensniff/zoul \
+sensniff/zoul:ZOUL_CONF_SUB_GHZ_SNIFFER=1 \
+storage/cfs-coffee/zoul \
+storage/antelope-shell/zoul \
+6tisch/simple-node/zoul \
+6tisch/simple-node/zoul:MAKE_WITH_ORCHESTRA=1 \
+6tisch/simple-node/zoul:MAKE_WITH_SECURITY=1 \
+libs/logging/zoul \
+6tisch/etsi-plugtest-2017/zoul:BOARD=remote \
+6tisch/6p-packet/zoul \
+6tisch/sixtop/zoul \
+http-socket/zoul \
+libs/timers/zoul \
+libs/energest/zoul \
+libs/trickle-library/zoul \
+nullnet/zoul \
+slip-radio/zoul \
+storage/cfs-coffee/openmote-cc2538 \
+sensniff/openmote-cc2538 \
+hello-world/openmote-cc2538 \
+rpl-udp/openmote-cc2538 \
+rpl-border-router/openmote-cc2538
+
+TOOLS=
+
+include ../Makefile.compile-test
diff --git a/tests/04-compile-nrf52-ports/Makefile b/tests/04-compile-nrf52-ports/Makefile
deleted file mode 100644
index 7f4ad4f2d..000000000
--- a/tests/04-compile-nrf52-ports/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-EXAMPLESDIR=../../examples
-TOOLSDIR=../../tools
-
-# Note, that SERVER_IPV6_ADDR variable is set to ffff on purpose
-# even though it's not a valid IPV6 address. This is due to limitation
-# of the testing framework which splits compliation arguments using
-# a colon.
-
-EXAMPLES = \
-hello-world/nrf52dk \
-platform-specific/nrf52dk/coap-demo/nrf52dk:coap-server \
-platform-specific/nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
-platform-specific/nrf52dk/mqtt-demo/nrf52dk \
-platform-specific/nrf52dk/blink-hello/nrf52dk \
-platform-specific/nrf52dk/timer-test/nrf52dk \
-libs/logging/nrf52dk
-
-TOOLS=
-
-include ../Makefile.compile-test
diff --git a/tests/03-compile-nxp-ports/Makefile b/tests/04-compile-nxp-ports/Makefile
similarity index 100%
rename from tests/03-compile-nxp-ports/Makefile
rename to tests/04-compile-nxp-ports/Makefile