diff --git a/regression-tests/01-compile-base/Makefile b/regression-tests/01-compile-base/Makefile
index bc38a9777..5ae452c36 100644
--- a/regression-tests/01-compile-base/Makefile
+++ b/regression-tests/01-compile-base/Makefile
@@ -35,9 +35,6 @@ wget/minimal-net \
 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 \
 cfs-coffee/sky \
 cfs-coffee/z1 \
 cfs-coffee/wismote \
diff --git a/regression-tests/11-ipv6/19-z1-rpl-tsch.csc b/regression-tests/11-ipv6/19-z1-rpl-tsch.csc.flaky
similarity index 100%
rename from regression-tests/11-ipv6/19-z1-rpl-tsch.csc
rename to regression-tests/11-ipv6/19-z1-rpl-tsch.csc.flaky
diff --git a/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc b/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc.flaky
similarity index 100%
rename from regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc
rename to regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc.flaky
diff --git a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc.flaky
similarity index 100%
rename from regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
rename to regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc.flaky
diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index e0addfa9f..e6e3c581f 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -49,7 +49,10 @@ udp-ipv6/stm32nucleo-spirit1 \
 hello-world/stm32nucleo-spirit1 \
 cfs-coffee/cc2538dk \
 cfs-coffee/openmote-cc2538 \
-cfs-coffee/zoul
+cfs-coffee/zoul \
+ipv6/rpl-tsch/zoul \
+ipv6/rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \
+ipv6/rpl-tsch/zoul:MAKE_WITH_SECURITY=1
 
 TOOLS=