diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile
index 09f89418d..51e68f9a2 100644
--- a/tests/01-compile-base/Makefile
+++ b/tests/01-compile-base/Makefile
@@ -6,6 +6,7 @@ hello-world/native \
hello-world/native:MAKE_NET=MAKE_NET_NULLNET \
hello-world/native:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \
hello-world/sky \
+hello-world/z1 \
storage/eeprom-test/native \
libs/logging/native \
libs/energest/native \
@@ -30,6 +31,7 @@ mqtt-client/native \
coap/coap-example-client/native \
coap/coap-example-server/native \
coap/coap-plugtest-server/native \
+sensniff/z1 \
TOOLS=
diff --git a/tests/07-simulation-base/07-hello-world-z1.csc b/tests/07-simulation-base/07-hello-world-z1.csc
new file mode 100644
index 000000000..33963c36c
--- /dev/null
+++ b/tests/07-simulation-base/07-hello-world-z1.csc
@@ -0,0 +1,83 @@
+
+
+
+ Hello World (Z1)
+ generated
+ 1000000
+
+ org.contikios.cooja.radiomediums.UDGM
+ 50.0
+ 100.0
+ 1.0
+ 1.0
+
+
+ 40000
+
+
+ org.contikios.cooja.mspmote.Z1MoteType
+ z11
+ Z1 Mote Type #z11
+
+ make hello-world.z1 TARGET=z1
+ [CONTIKI_DIR]/examples/hello-world/hello-world.z1
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.interfaces.IPAddress
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
+ org.contikios.cooja.mspmote.interfaces.MspClock
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
+ org.contikios.cooja.mspmote.interfaces.MspDefaultSerial
+ org.contikios.cooja.mspmote.interfaces.MspLED
+ org.contikios.cooja.mspmote.interfaces.MspDebugOutput
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 94.96401380574989
+ 21.247662337471553
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 1
+
+ z11
+
+
+
+ org.contikios.cooja.plugins.SimControl
+ 280
+ 2
+ 160
+ 38
+ 13
+
+
+ org.contikios.cooja.plugins.LogListener
+
+
+
+ 680
+ 1
+ 240
+ 109
+ 377
+
+
+ org.contikios.cooja.plugins.ScriptRunner
+
+ [CONFIG_DIR]/hello-world.js
+ true
+
+ 600
+ 0
+ 700
+ 330
+ 24
+
+
+
diff --git a/tests/07-simulation-base/23-rpl-tsch-z1.csc b/tests/07-simulation-base/23-rpl-tsch-z1.csc
new file mode 100644
index 000000000..f5a182ecd
--- /dev/null
+++ b/tests/07-simulation-base/23-rpl-tsch-z1.csc
@@ -0,0 +1,206 @@
+
+
+ [APPS_DIR]/mrm
+ [APPS_DIR]/mspsim
+ [APPS_DIR]/avrora
+ [APPS_DIR]/serial_socket
+ [APPS_DIR]/powertracker
+
+ RPL+TSCH (Z1)
+ 123456
+ 1000000
+
+ org.contikios.cooja.radiomediums.UDGM
+ 50.0
+ 100.0
+ 1.0
+ 1.0
+
+
+ 40000
+
+
+ org.contikios.cooja.mspmote.Z1MoteType
+ z11
+ Z1 Mote Type #z11
+
+ make TARGET=z1 clean
+ make -j node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.interfaces.IPAddress
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
+ org.contikios.cooja.mspmote.interfaces.MspClock
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
+ org.contikios.cooja.mspmote.interfaces.MspDefaultSerial
+ org.contikios.cooja.mspmote.interfaces.MspLED
+ org.contikios.cooja.mspmote.interfaces.MspDebugOutput
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ -1.285769821276336
+ 38.58045647334346
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 1
+
+ z11
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ -19.324109516886306
+ 76.23135780254927
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 2
+
+ z11
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 5.815501305791592
+ 76.77463755494317
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 3
+
+ z11
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 31.920697784030082
+ 50.5212265977149
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 4
+
+ z11
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 47.21747673247198
+ 30.217765340599726
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 5
+
+ z11
+
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 10.622284947035123
+ 109.81862399725188
+ 0.0
+
+
+ org.contikios.cooja.mspmote.interfaces.MspMoteID
+ 6
+
+ z11
+
+
+
+ org.contikios.cooja.plugins.SimControl
+ 242
+ 4
+ 160
+ 11
+ 241
+
+
+ org.contikios.cooja.plugins.Visualizer
+
+ true
+ org.contikios.cooja.plugins.skins.IDVisualizerSkin
+ org.contikios.cooja.plugins.skins.GridVisualizerSkin
+ org.contikios.cooja.plugins.skins.TrafficVisualizerSkin
+ org.contikios.cooja.plugins.skins.UDGMVisualizerSkin
+ 1.7405603810040515 0.0 0.0 1.7405603810040515 47.95980153208088 -42.576134155447555
+
+ 236
+ 3
+ 230
+ 1
+ 1
+
+
+ org.contikios.cooja.plugins.LogListener
+
+ ID:1
+
+
+
+ 1031
+ 0
+ 394
+ 273
+ 6
+
+
+ org.contikios.cooja.plugins.TimeLine
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+
+
+
+ 16529.88882215865
+
+ 1304
+ 2
+ 311
+ 0
+ 412
+
+
+ org.contikios.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 764
+ 1
+ 995
+ 963
+ 111
+
+
diff --git a/tests/07-simulation-base/hello-world.js b/tests/07-simulation-base/hello-world.js
new file mode 100644
index 000000000..5afaabe18
--- /dev/null
+++ b/tests/07-simulation-base/hello-world.js
@@ -0,0 +1,9 @@
+TIMEOUT(5000);
+
+while(true) {
+ log.log("> " + msg + "\n");
+ if (msg.equals('Hello, world')) {
+ log.testOK();
+ }
+ YIELD();
+}