diff --git a/regression-tests/01-compile-base/Makefile b/regression-tests/01-compile-base/Makefile
index 9fcf0cf90..484880773 100644
--- a/regression-tests/01-compile-base/Makefile
+++ b/regression-tests/01-compile-base/Makefile
@@ -35,6 +35,8 @@ zolertia/z1/z1 \
 settings-example/avr-raven \
 ipv6/multicast/sky \
 ipv6/rpl-tsch/z1 \
+ipv6/rpl-tsch/z1:MAKE_WITH_ORCHESTRA=1 \
+ipv6/rpl-tsch/z1:MAKE_WITH_SECURITY=1
 
 
 TOOLS=
diff --git a/regression-tests/11-ipv6/19-z1-rpl-tsch.csc b/regression-tests/11-ipv6/19-z1-rpl-tsch.csc
index 9785af5a4..7488e8c3b 100644
--- a/regression-tests/11-ipv6/19-z1-rpl-tsch.csc
+++ b/regression-tests/11-ipv6/19-z1-rpl-tsch.csc
@@ -271,7 +271,9 @@ make node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0</commands>
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
  * 8 routing entries (i.e. can reach every node) */&#xD;
+log.log("Waiting for routing tables to fill\n");&#xD;
 WAIT_UNTIL(msg.endsWith("Routing entries (8 in total):"));&#xD;
+log.log("Root routing table ready\n");&#xD;
 &#xD;
 log.testOK(); /* Report test success and quit */</script>
       <active>true</active>
diff --git a/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc b/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc
index ea80dfea8..3fecd2040 100644
--- a/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc
+++ b/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc
@@ -269,12 +269,16 @@ make node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=1 MAKE_WITH_SECURITY=0</commands>
     <plugin_config>
       <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
 &#xD;
+log.log("Waiting for Orchestra to start\n");&#xD;
 /* Check that Orchestra is running */&#xD;
 WAIT_UNTIL(msg.startsWith("Orchestra:"));&#xD;
+log.log("Orchestra started\n");&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
  * 8 routing entries (i.e. can reach every node) */&#xD;
+log.log("Waiting for routing tables to fill\n");&#xD;
 WAIT_UNTIL(msg.endsWith("Routing entries (8 in total):"));&#xD;
+log.log("Root routing table ready\n");&#xD;
 &#xD;
 log.testOK(); /* Report test success and quit */</script>
       <active>true</active>
diff --git a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
index 94549726e..a24f7fe5b 100644
--- a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
+++ b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
@@ -269,12 +269,16 @@ make node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1</commands>
     <plugin_config>
       <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
 &#xD;
+log.log("Waiting for association with security\n");&#xD;
 /* Check that nodes associate with security */&#xD;
 WAIT_UNTIL(msg.startsWith("TSCH: association done, sec 1,"));&#xD;
+log.log("Association with security done\n");&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
  * 8 routing entries (i.e. can reach every node) */&#xD;
+log.log("Waiting for routing tables to fill\n");&#xD;
 WAIT_UNTIL(msg.endsWith("Routing entries (8 in total):"));&#xD;
+log.log("Root routing table ready\n");&#xD;
 &#xD;
 log.testOK(); /* Report test success and quit */</script>
       <active>true</active>
diff --git a/regression-tests/22-compile-nxp-ports/Makefile b/regression-tests/22-compile-nxp-ports/Makefile
index 7ff68eaef..681df7ca7 100644
--- a/regression-tests/22-compile-nxp-ports/Makefile
+++ b/regression-tests/22-compile-nxp-ports/Makefile
@@ -9,7 +9,10 @@ jn516x/rpl/border-router/jn516x \
 jn516x/rpl/node/jn516x \
 jn516x/rpl/coap-dongle-node/jn516x \
 jn516x/rpl/coap-dr1175-node/jn516x \
-jn516x/rpl/coap-dr1199-node/jn516x  
+jn516x/rpl/coap-dr1199-node/jn516x \
+ipv6/rpl-tsch/jn516x \
+ipv6/rpl-tsch/jn516x:MAKE_WITH_ORCHESTRA=1 \
+ipv6/rpl-tsch/jn516x:MAKE_WITH_SECURITY=1
 
 TOOLS=