diff --git a/tools/cooja/contiki_tests/cooja_helloworld.csc b/regression-tests/02-hello-world/01-hello-world-cooja.csc
similarity index 100%
rename from tools/cooja/contiki_tests/cooja_helloworld.csc
rename to regression-tests/02-hello-world/01-hello-world-cooja.csc
diff --git a/tools/cooja/contiki_tests/sky_helloworld.csc b/regression-tests/02-hello-world/02-hello-world-sky.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_helloworld.csc
rename to regression-tests/02-hello-world/02-hello-world-sky.csc
diff --git a/tools/cooja/contiki_tests/micaz_helloworld.csc b/regression-tests/02-hello-world/03-hello-world-micaz.csc
similarity index 100%
rename from tools/cooja/contiki_tests/micaz_helloworld.csc
rename to regression-tests/02-hello-world/03-hello-world-micaz.csc
diff --git a/tools/cooja/contiki_tests/esb_helloworld.csc b/regression-tests/02-hello-world/04-hello-world-esb.csc
similarity index 100%
rename from tools/cooja/contiki_tests/esb_helloworld.csc
rename to regression-tests/02-hello-world/04-hello-world-esb.csc
diff --git a/tools/cooja/contiki_tests/exp5438_helloworld.csc b/regression-tests/02-hello-world/05-exp5438-hello-world.csc
similarity index 100%
rename from tools/cooja/contiki_tests/exp5438_helloworld.csc
rename to regression-tests/02-hello-world/05-exp5438-hello-world.csc
diff --git a/tools/cooja/contiki_tests/wismote_helloworld.csc b/regression-tests/02-hello-world/06-wismote-hello-world.csc
similarity index 100%
rename from tools/cooja/contiki_tests/wismote_helloworld.csc
rename to regression-tests/02-hello-world/06-wismote-hello-world.csc
diff --git a/tools/cooja/contiki_tests/z1_helloworld.csc b/regression-tests/02-hello-world/07-z1-hello-world.csc
similarity index 100%
rename from tools/cooja/contiki_tests/z1_helloworld.csc
rename to regression-tests/02-hello-world/07-z1-hello-world.csc
diff --git a/tools/cooja/contiki_tests/hello-world.js b/regression-tests/02-hello-world/hello-world.js
similarity index 100%
rename from tools/cooja/contiki_tests/hello-world.js
rename to regression-tests/02-hello-world/hello-world.js
diff --git a/tools/cooja/contiki_tests/multithreading.csc b/regression-tests/03-base/01-multithreading.csc
similarity index 75%
rename from tools/cooja/contiki_tests/multithreading.csc
rename to regression-tests/03-base/01-multithreading.csc
index 079a365f8..9029af9da 100644
--- a/tools/cooja/contiki_tests/multithreading.csc
+++ b/regression-tests/03-base/01-multithreading.csc
@@ -1,135 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project>../apps/mrm</project>
-  <project>../apps/mspsim</project>
-  <project>../apps/avrora</project>
-  <project>../apps/native_gateway</project>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source>../../../examples/multi-threading/multi-threading.c</source>
-      <commands>make clean TARGET=sky
-make multi-threading.sky TARGET=sky</commands>
-      <firmware>../../../examples/multi-threading/multi-threading.sky</firmware>
-      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
-    </motetype>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <breakpoints />
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>83.20518861404864</x>
-        <y>11.060511519885651</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>265</width>
-    <z>3</z>
-    <height>200</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.Visualizer
-    <plugin_config />
-    <width>263</width>
-    <z>2</z>
-    <height>292</height>
-    <location_x>1</location_x>
-    <location_y>202</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-    </plugin_config>
-    <width>865</width>
-    <z>0</z>
-    <height>209</height>
-    <location_x>3</location_x>
-    <location_y>701</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(60000, log.log("nrLowAlpha: " + nrLowAlpha + "\nnrHighAlpha: " + nrHighAlpha + "\nnrLowCount: " + nrLowCount + "\nnrHighCount: " + nrHighCount + "\n"));
-
-lowAlpha = "BA";
-highAlpha = "JIHGFEDCBA";
-lowCount = "10";
-highCount = "9876543210";
-
-nrLowAlpha = 0;
-nrHighAlpha = 0;
-nrLowCount = 0;
-nrHighCount = 0;
-
-while (true) {
-
-  if (msg.equals(lowCount)) {
-    //log.log("Count is low\n");
-    nrLowCount++;
-  } else if (msg.equals(lowAlpha)) {
-    //log.log("Alpha is low\n");
-    nrLowAlpha++;
-  } else if (msg.equals(highCount)) {
-    //log.log("Count is high\n");
-    nrHighCount++;
-  } else if (msg.equals(highAlpha)) {
-    //log.log("Alpha is high\n");
-    nrHighAlpha++;
-  }
-
-  if (nrLowCount &gt;= 5 &amp;&amp;
-      nrLowAlpha &gt;= 5 &amp;&amp;
-      nrLowCount &gt;= 5 &amp;&amp;
-      nrHighCount &gt;= 5 &amp;&amp;
-      nrHighAlpha &gt;= 5) {
-     log.testOK();
-  }
-  YIELD();
-}</script>
-      <active>true</active>
-    </plugin_config>
-    <width>600</width>
-    <z>1</z>
-    <height>700</height>
-    <location_x>267</location_x>
-    <location_y>1</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/multi-threading/multi-threading.c</source>
+      <commands EXPORT="discard">make clean TARGET=sky
+make multi-threading.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/multi-threading/multi-threading.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>83.20518861404864</x>
+        <y>11.060511519885651</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>265</width>
+    <z>3</z>
+    <height>200</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 49.35891944177396 108.94498952737668</viewport>
+    </plugin_config>
+    <width>263</width>
+    <z>2</z>
+    <height>292</height>
+    <location_x>1</location_x>
+    <location_y>202</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+    </plugin_config>
+    <width>865</width>
+    <z>0</z>
+    <height>209</height>
+    <location_x>3</location_x>
+    <location_y>701</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>TIMEOUT(60000, log.log("nrLowAlpha: " + nrLowAlpha + "\nnrHighAlpha: " + nrHighAlpha + "\nnrLowCount: " + nrLowCount + "\nnrHighCount: " + nrHighCount + "\n"));
+
+lowAlpha = "BA";
+highAlpha = "JIHGFEDCBA";
+lowCount = "10";
+highCount = "9876543210";
+
+nrLowAlpha = 0;
+nrHighAlpha = 0;
+nrLowCount = 0;
+nrHighCount = 0;
+
+while (true) {
+
+  if (msg.equals(lowCount)) {
+    //log.log("Count is low\n");
+    nrLowCount++;
+  } else if (msg.equals(lowAlpha)) {
+    //log.log("Alpha is low\n");
+    nrLowAlpha++;
+  } else if (msg.equals(highCount)) {
+    //log.log("Count is high\n");
+    nrHighCount++;
+  } else if (msg.equals(highAlpha)) {
+    //log.log("Alpha is high\n");
+    nrHighAlpha++;
+  }
+
+  if (nrLowCount &gt;= 5 &amp;&amp;
+      nrLowAlpha &gt;= 5 &amp;&amp;
+      nrLowCount &gt;= 5 &amp;&amp;
+      nrHighCount &gt;= 5 &amp;&amp;
+      nrHighAlpha &gt;= 5) {
+     log.testOK();
+  }
+  YIELD();
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>1</z>
+    <height>700</height>
+    <location_x>267</location_x>
+    <location_y>1</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/sky_coffee.csc b/regression-tests/03-base/02-sky-coffee.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_coffee.csc
rename to regression-tests/03-base/02-sky-coffee.csc
diff --git a/tools/cooja/contiki_tests/sky_checkpointing.csc b/regression-tests/03-base/04-sky-checkpointing.csc
similarity index 97%
rename from tools/cooja/contiki_tests/sky_checkpointing.csc
rename to regression-tests/03-base/04-sky-checkpointing.csc
index 55c654f09..9dc98818d 100644
--- a/tools/cooja/contiki_tests/sky_checkpointing.csc
+++ b/regression-tests/03-base/04-sky-checkpointing.csc
@@ -20,10 +20,10 @@
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky-shell/sky-checkpoint.c</source>
+      <source>../../examples/sky-shell/sky-checkpoint.c</source>
       <commands>make clean TARGET=sky
 make sky-checkpoint.sky TARGET=sky</commands>
-      <firmware>../../../examples/sky-shell/sky-checkpoint.sky</firmware>
+      <firmware>../../examples/sky-shell/sky-checkpoint.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
diff --git a/tools/cooja/contiki_tests/crosslevel.csc b/regression-tests/03-base/x03-crosslevel.csc
similarity index 100%
rename from tools/cooja/contiki_tests/crosslevel.csc
rename to regression-tests/03-base/x03-crosslevel.csc
diff --git a/tools/cooja/contiki_tests/rime_collect.csc b/regression-tests/04-rime/01-cooja-collect.csc
similarity index 100%
rename from tools/cooja/contiki_tests/rime_collect.csc
rename to regression-tests/04-rime/01-cooja-collect.csc
diff --git a/tools/cooja/contiki_tests/rime_rucb.csc b/regression-tests/04-rime/02-cooja-rucb.csc
similarity index 98%
rename from tools/cooja/contiki_tests/rime_rucb.csc
rename to regression-tests/04-rime/02-cooja-rucb.csc
index a6bdb9281..a8529ea85 100644
--- a/tools/cooja/contiki_tests/rime_rucb.csc
+++ b/regression-tests/04-rime/02-cooja-rucb.csc
@@ -20,7 +20,7 @@
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype296</identifier>
       <description>Contiki Mote #1</description>
-      <contikiapp>../../../examples/rime/example-rucb.c</contikiapp>
+      <contikiapp>[CONTIKI_DIR]/examples/rime/example-rucb.c</contikiapp>
       <commands>make example-rucb.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
diff --git a/tools/cooja/contiki_tests/rime_abc.csc b/regression-tests/04-rime/03-sky-abc.csc
similarity index 96%
rename from tools/cooja/contiki_tests/rime_abc.csc
rename to regression-tests/04-rime/03-sky-abc.csc
index 87732991f..5c71a54b5 100644
--- a/tools/cooja/contiki_tests/rime_abc.csc
+++ b/regression-tests/04-rime/03-sky-abc.csc
@@ -20,10 +20,10 @@
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source>../../../examples/rime/example-abc.c</source>
+      <source>[CONTIKI_DIR]/examples/rime/example-abc.c</source>
       <commands>make clean TARGET=sky
 make example-abc.sky TARGET=sky</commands>
-      <firmware>../../../examples/rime/example-abc.sky</firmware>
+      <firmware>[CONTIKI_DIR]/examples/rime/example-abc.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
diff --git a/tools/cooja/contiki_tests/sky_deluge.csc b/regression-tests/04-rime/04-sky-deluge.csc
similarity index 97%
rename from tools/cooja/contiki_tests/sky_deluge.csc
rename to regression-tests/04-rime/04-sky-deluge.csc
index 69f3a2051..d662b1dec 100644
--- a/tools/cooja/contiki_tests/sky_deluge.csc
+++ b/regression-tests/04-rime/04-sky-deluge.csc
@@ -20,10 +20,10 @@
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky/test-deluge.c</source>
+      <source>[CONTIKI_DIR]/examples/sky/test-deluge.c</source>
       <commands>make clean TARGET=sky
 make APPS=deluge test-deluge.sky TARGET=sky</commands>
-      <firmware>../../../examples/sky/test-deluge.sky</firmware>
+      <firmware>[CONTIKI_DIR]/examples/sky/test-deluge.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
diff --git a/tools/cooja/contiki_tests/rime_runicast.csc b/regression-tests/04-rime/05-sky-runicast.csc
similarity index 97%
rename from tools/cooja/contiki_tests/rime_runicast.csc
rename to regression-tests/04-rime/05-sky-runicast.csc
index 7a707db5d..79b3f0b0b 100644
--- a/tools/cooja/contiki_tests/rime_runicast.csc
+++ b/regression-tests/04-rime/05-sky-runicast.csc
@@ -20,10 +20,10 @@
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source>../../../examples/rime/example-runicast.c</source>
+      <source>[CONTIKI_DIR]/examples/rime/example-runicast.c</source>
       <commands>make clean TARGET=sky
 make example-runicast.sky TARGET=sky</commands>
-      <firmware>../../../examples/rime/example-runicast.sky</firmware>
+      <firmware>[CONTIKI_DIR]/examples/rime/example-runicast.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
diff --git a/tools/cooja/contiki_tests/rime_trickle.csc b/regression-tests/04-rime/06-sky-trickle.csc
similarity index 98%
rename from tools/cooja/contiki_tests/rime_trickle.csc
rename to regression-tests/04-rime/06-sky-trickle.csc
index 6e0c6b71e..926ebece1 100644
--- a/tools/cooja/contiki_tests/rime_trickle.csc
+++ b/regression-tests/04-rime/06-sky-trickle.csc
@@ -20,10 +20,10 @@
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source>../../../examples/rime/example-trickle.c</source>
+      <source>[CONTIKI_DIR]/examples/rime/example-trickle.c</source>
       <commands>make clean TARGET=sky
 make example-trickle.sky TARGET=sky</commands>
-      <firmware>../../../examples/rime/example-trickle.sky</firmware>
+      <firmware>[CONTIKI_DIR]/examples/rime/example-trickle.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
diff --git a/tools/cooja/contiki_tests/sky_collect.csc b/regression-tests/04-rime/07-sky-collect.csc
similarity index 98%
rename from tools/cooja/contiki_tests/sky_collect.csc
rename to regression-tests/04-rime/07-sky-collect.csc
index 03347d675..769c5b494 100644
--- a/tools/cooja/contiki_tests/sky_collect.csc
+++ b/regression-tests/04-rime/07-sky-collect.csc
@@ -20,10 +20,10 @@
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky/sky-collect.c</source>
+      <source>[CONTIKI_DIR]/examples/sky/sky-collect.c</source>
       <commands>make clean TARGET=sky
 make sky-collect.sky TARGET=sky</commands>
-      <firmware>../../../examples/sky/sky-collect.sky</firmware>
+      <firmware>[CONTIKI_DIR]/examples/sky/sky-collect.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
diff --git a/tools/cooja/contiki_tests/rime_collect_sky.csc b/regression-tests/04-rime/08-sky-collect.csc
similarity index 100%
rename from tools/cooja/contiki_tests/rime_collect_sky.csc
rename to regression-tests/04-rime/08-sky-collect.csc
diff --git a/tools/cooja/contiki_tests/netperf-sky.csc b/regression-tests/05-netperf/01-sky-netperf.csc
similarity index 100%
rename from tools/cooja/contiki_tests/netperf-sky.csc
rename to regression-tests/05-netperf/01-sky-netperf.csc
diff --git a/tools/cooja/contiki_tests/netperf-sky-lpp.csc b/regression-tests/05-netperf/02-sky-netperf-lpp.csc
similarity index 100%
rename from tools/cooja/contiki_tests/netperf-sky-lpp.csc
rename to regression-tests/05-netperf/02-sky-netperf-lpp.csc
diff --git a/tools/cooja/contiki_tests/netperf-sky-cxmac.csc b/regression-tests/05-netperf/03-sky-netperf-cxmac.csc
similarity index 100%
rename from tools/cooja/contiki_tests/netperf-sky-cxmac.csc
rename to regression-tests/05-netperf/03-sky-netperf-cxmac.csc
diff --git a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc b/regression-tests/06-shell/01-sky-shell-compile.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_shell_compilation_test.csc
rename to regression-tests/06-shell/01-sky-shell-compile.csc
diff --git a/tools/cooja/contiki_tests/sky_shell_basic_commands.csc b/regression-tests/06-shell/02-sky-shell-basic-commands.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_shell_basic_commands.csc
rename to regression-tests/06-shell/02-sky-shell-basic-commands.csc
diff --git a/tools/cooja/contiki_tests/sky_shell_sendcmd.csc b/regression-tests/06-shell/03-sky-shell-sendcmd.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_shell_sendcmd.csc
rename to regression-tests/06-shell/03-sky-shell-sendcmd.csc
diff --git a/tools/cooja/contiki_tests/sky_shell_download.csc b/regression-tests/06-shell/04-sky-shell-download.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_shell_download.csc
rename to regression-tests/06-shell/04-sky-shell-download.csc
diff --git a/tools/cooja/contiki_tests/sky_shell_exec_serial.csc b/regression-tests/07-elfloader/01-sky-shell-exec-serial.csc
similarity index 98%
rename from tools/cooja/contiki_tests/sky_shell_exec_serial.csc
rename to regression-tests/07-elfloader/01-sky-shell-exec-serial.csc
index 795578ed3..2c160c8e9 100644
--- a/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
+++ b/regression-tests/07-elfloader/01-sky-shell-exec-serial.csc
@@ -94,7 +94,7 @@ make hello-world.ce TARGET=sky SMALL=0</commands>
     <plugin_config>
       <script>TIMEOUT(50000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
 
-helloworld = new java.io.File("../../../examples/sky-shell-exec/hello-world.ce");
+helloworld = new java.io.File("../../examples/sky-shell-exec/hello-world.ce");
 log.log("Running test on:  " + helloworld.getAbsolutePath() + "\n");
 if (!helloworld.exists()) {
   log.log("hello-world.ce does not exist\n");
diff --git a/tools/cooja/contiki_tests/sky_shell_collect.csc b/regression-tests/08-collect/01-sky-shell-collect.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_shell_collect.csc
rename to regression-tests/08-collect/01-sky-shell-collect.csc
diff --git a/tools/cooja/contiki_tests/sky_shell_collect_lossy.csc b/regression-tests/08-collect/02-sky-shell-collect-lossy.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_shell_collect_lossy.csc
rename to regression-tests/08-collect/02-sky-shell-collect-lossy.csc
diff --git a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc b/regression-tests/09-ipv4/x01-ip-cooja-telnet-ping.csc
similarity index 100%
rename from tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
rename to regression-tests/09-ipv4/x01-ip-cooja-telnet-ping.csc
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc b/regression-tests/09-ipv4/x02-ip-sky-telnet-ping.csc
similarity index 100%
rename from tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
rename to regression-tests/09-ipv4/x02-ip-sky-telnet-ping.csc
diff --git a/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc b/regression-tests/09-ipv4/x03-ip-sky-webserver-wget.csc
similarity index 100%
rename from tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
rename to regression-tests/09-ipv4/x03-ip-sky-webserver-wget.csc
diff --git a/tools/cooja/contiki_tests/cooja_ipv6_udp.csc b/regression-tests/10-ipv6/01-cooja-ipv6-udp.csc
similarity index 99%
rename from tools/cooja/contiki_tests/cooja_ipv6_udp.csc
rename to regression-tests/10-ipv6/01-cooja-ipv6-udp.csc
index 8d5f0b14f..c258e098e 100644
--- a/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
+++ b/regression-tests/10-ipv6/01-cooja-ipv6-udp.csc
@@ -49,7 +49,7 @@ make udp-server.cooja TARGET=cooja</commands>
       <identifier>mtype512</identifier>
       <description>Sender</description>
       <contikiapp>[CONTIKI_DIR]/examples/udp-ipv6/udp-client.c</contikiapp>
-      <commands>make udp-client.cooja TARGET=cooja DEFINES=UDP_CONNECTION_ADDR=fe80::301:1ff:fe01:101</commands>
+      <commands>make udp-client.cooja TARGET=cooja DEFINES=UDP_CONNECTION_ADDR=fe80::201:1:1:1</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp.csc b/regression-tests/10-ipv6/02-sky-ipv6-udp.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_ipv6_udp.csc
rename to regression-tests/10-ipv6/02-sky-ipv6-udp.csc
diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp_fragmentation.csc b/regression-tests/10-ipv6/03-sky-ipv6-udp-fragmentation.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky_ipv6_udp_fragmentation.csc
rename to regression-tests/10-ipv6/03-sky-ipv6-udp-fragmentation.csc
diff --git a/tools/cooja/contiki_tests/sky-ipv6-rpl-collect.csc b/regression-tests/11-rpl/01-sky-ipv6-rpl-collect.csc
similarity index 100%
rename from tools/cooja/contiki_tests/sky-ipv6-rpl-collect.csc
rename to regression-tests/11-rpl/01-sky-ipv6-rpl-collect.csc
diff --git a/tools/cooja/contiki_tests/servreg-hack.csc b/regression-tests/12-ipv6-apps/01-sky-servreg-hack.csc
similarity index 100%
rename from tools/cooja/contiki_tests/servreg-hack.csc
rename to regression-tests/12-ipv6-apps/01-sky-servreg-hack.csc
diff --git a/tools/cooja/contiki_tests/rest_rpl_coap.js b/regression-tests/12-ipv6-apps/rest_rpl_coap.js
similarity index 98%
rename from tools/cooja/contiki_tests/rest_rpl_coap.js
rename to regression-tests/12-ipv6-apps/rest_rpl_coap.js
index 93773f21a..c07a6ee69 100644
--- a/tools/cooja/contiki_tests/rest_rpl_coap.js
+++ b/regression-tests/12-ipv6-apps/rest_rpl_coap.js
@@ -21,7 +21,7 @@ sim.setSpeedLimit(1.0);
 /* create tunnel interface */
 log.log("create tunnel interface\n");
 launcher = new java.lang.ProcessBuilder["(java.lang.String[])"](['sh','-c',CMD_TUNNEL]);
-launcher.directory(new java.io.File("../../../examples/er-rest-example"));
+launcher.directory(new java.io.File("../../examples/er-rest-example"));
 launcher.redirectErrorStream(true);
 tunProcess = launcher.start();
 tunRunnable = new Object();
diff --git a/tools/cooja/contiki_tests/rest_rpl_coap.csc b/regression-tests/12-ipv6-apps/x02-sky-coap.csc
similarity index 100%
rename from tools/cooja/contiki_tests/rest_rpl_coap.csc
rename to regression-tests/12-ipv6-apps/x02-sky-coap.csc
diff --git a/tools/cooja/contiki_tests/RUN_ALL b/tools/cooja/contiki_tests/RUN_ALL
deleted file mode 100644
index 10fa2434a..000000000
--- a/tools/cooja/contiki_tests/RUN_ALL
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-#LOG="TEST-`date '+%F'`.log"
-LOG=currentlog.log
-MAIL=0
-CVS=0
-PROGNAME=`basename $0`
-
-Usage() {
-  echo >&2 "$PROGNAME:" "$@"
-  echo >&2 "Usage: $PROGNAME [-cvs] [-mail]"
-  exit 10
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  -cvs) CVS=1 ;;
-  -mail) MAIL=1 ;;
-  *) Usage "Unknown option \"$1\"" ;;
-  esac
-  shift
-done
-
-if [ -z "$CONTIKI" ]; then
-  if [ -z "$CONTIKI_HOME" ]; then
-  	CONTIKI_HOME=../../..
-    echo Undefined variable: CONTIKI_HOME. Using default: ${CONTIKI_HOME}
-  fi
-  CONTIKI=$CONTIKI_HOME
-fi
-
-if [ $MAIL -eq 1 ]; then
-  if [ -z "$MAILTO" ]; then
-    echo Undefined variable: MAILTO
-    exit 1
-  fi
-fi
-
-function mail_report() {
-  if [ $MAIL -eq 1 ]; then
-    echo ">>>>>>> Sending mail <<<<<<<<"
-    echo "[`date '+%F %T'`] Mailing test report" >> $LOG
-    cat $LOG | mail -s "Contiki test results" $MAILTO
-    if [ "$?" -ne 0 ]; then
-      echo "Failed to send mail"
-      echo "[`date '+%F %T'`] MAIL FAILED" >> $LOG
-    else
-      echo "[`date '+%F %T'`] test report sent" >> $LOG
-    fi
-  else
-    echo
-    echo
-    echo ">>>>>>> Test Report <<<<<<<<"
-    cat $LOG
-  fi
-  cp $LOG RUN_ALL_LAST.log
-}
-
-echo ">>>>>>> Cleaning up previous tests <<<<<<<<"
-rm -f *.log *.cooja_log
-rm -fr se obj_cooja
-rm -f symbols.c symbols.h
-
-echo ">>>>>>> Creating test log <<<<<<<<"
-touch $LOG
-
-if [ $CVS -eq 1 ]; then
-  echo ">>>>>>> Updating from CVS <<<<<<<<"
-  echo -n "[`date '+%F %T'`] Updating CVS: " >> $LOG
-  (cd $CONTIKI && cvs update -dP)
-  if [ "$?" != "0" ]; then
-    echo "FAIL" >> $LOG
-    mail_report
-    exit 1
-  fi
-  echo "OK" >> $LOG
-fi
-
-echo ">>>>>>> Building COOJA <<<<<<<<"
-echo -n "[`date '+%F %T'`] Building COOJA: " >> $LOG
-(cd $CONTIKI/tools/cooja && ant clean && ant jar)
-if [ "$?" != "0" ]; then
-  echo "Compilation of COOJA failed"
-  echo "FAIL" >> $LOG
-  mail_report
-  exit 1
-fi
-echo "OK" >> $LOG
-
-echo >> $LOG
-for myfile in ./*.csc
-do
-  TEST=`basename $myfile .csc`
-  bash RUN_TEST $TEST $LOG
-done
-
-mail_report
\ No newline at end of file
diff --git a/tools/cooja/contiki_tests/RUN_REPEATED b/tools/cooja/contiki_tests/RUN_REPEATED
deleted file mode 100644
index b80a668fa..000000000
--- a/tools/cooja/contiki_tests/RUN_REPEATED
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Usage
-if [ $# -eq 2 ]; then
-  REPEATS=$1
-  TEST=$2
-else
-  echo "Usage: $0 <nr_repeats> <test>"
-  echo "Example: $0 10 cooja_helloworld"
-  exit 1
-fi
-
-# Locate Contiki/COOJA
-if [ -z "$CONTIKI" ]; then
-  if [ -z "$CONTIKI_HOME" ]; then
-  	CONTIKI_HOME=../../..
-  fi
-  CONTIKI=$CONTIKI_HOME
-fi
-
-# Clean up
-rm -f *.log *.cooja_log
-rm -fr se obj_cooja
-rm -f symbols.c symbols.h
-
-# Compile COOJA
-echo ">>>>>>> Building COOJA <<<<<<<<"
-(cd $CONTIKI/tools/cooja && ant clean && ant jar)
-if [ "$?" != "0" ]; then
-  echo "Compilation of COOJA failed"
-  exit 1
-fi
-
-# Run tests
-for COUNTER in `seq 1 $REPEATS`;
-do
-  echo ">>>>>>> Test $COUNTER/$REPEATS: $TEST-$COUNTER.log <<<<<<<<"
-  bash RUN_TEST $TEST RUN_REPEATED_LAST.log
-  mv $TEST.log $TEST-$COUNTER.log
-done
-
-echo
-cat RUN_REPEATED_LAST.log
-echo
-echo ">>>>>>> DONE! Test logs stored in $TEST-[1-$REPEATS].log <<<<<<<<"
diff --git a/tools/cooja/contiki_tests/RUN_TEST b/tools/cooja/contiki_tests/RUN_TEST
deleted file mode 100644
index c78705ff2..000000000
--- a/tools/cooja/contiki_tests/RUN_TEST
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-if [ $# -lt 1 -o $# -gt 2 ]; then
-  echo "Usage: $0 <test> [logfile]"
-  exit
-fi
-
-TEST=$1
-
-LOG=/dev/null
-if [ $# -eq 2 ]; then
-  LOG=$2
-fi
-
-echo ">>>>>>> Starting test: $TEST <<<<<<<<"
-echo -n "[`date '+%F %T'`] $TEST: " >> $LOG
-if [ -f "COOJA.log" ]; then
-  rm COOJA.log
-fi
-if [ -f "COOJA.testlog" ]; then
-  rm COOJA.testlog
-fi
-java -mx512m -jar ../dist/cooja.jar -nogui=$TEST.csc
-if [ -f "COOJA.log" ]; then
-  mv COOJA.log $TEST.cooja_log
-fi
-if [ -f "COOJA.testlog" ]; then
-  mv COOJA.testlog $TEST.log
-fi
-
-OK=0
-if [ -f "$TEST.log" ]; then
-  OK=`grep "TEST OK" $TEST.log | wc -l`
-fi
-
-if [ $OK == 0 ]; then
-  echo "FAIL" >> $LOG
-  if [ -f "$TEST.info" ]; then
-    echo "-- TEST INFO ($TEST.info) --" >> $LOG
-    cat $TEST.info >> $LOG
-  else
-    echo "-- NO TEST INFO AVAILABLE ($TEST.info) --" >> $LOG
-  fi
-  if [ -f "$TEST.log" ]; then
-    echo "-- TEST OUTPUT (tail $TEST.log) --" >> $LOG
-    tail -5 $TEST.log >> $LOG
-  else
-    echo "-- NO TEST OUTPUT AVAILABLE ($TEST.log) --" >> $LOG
-  fi
-  echo "-- COOJA OUTPUT (tail $TEST.cooja_log) --" >> $LOG
-  tail -10 $TEST.cooja_log >> $LOG
-echo >> $LOG
-else
-  echo "OK" >> $LOG
-fi
-echo >> $LOG
-
-if [ $OK == 0 ]; then
-  echo ">>>>>>> Finished test: $TEST FAILED <<<<<<<<"
-else
-  echo ">>>>>>> Finished test: $TEST OK <<<<<<<<"
-fi
-echo ""
diff --git a/tools/cooja/contiki_tests/cooja_helloworld.info b/tools/cooja/contiki_tests/cooja_helloworld.info
deleted file mode 100644
index 655b74b35..000000000
--- a/tools/cooja/contiki_tests/cooja_helloworld.info
+++ /dev/null
@@ -1 +0,0 @@
-Hello world test (single node, OS-level)   
diff --git a/tools/cooja/contiki_tests/cooja_ipv6_udp.info b/tools/cooja/contiki_tests/cooja_ipv6_udp.info
deleted file mode 100644
index 63959cbc0..000000000
--- a/tools/cooja/contiki_tests/cooja_ipv6_udp.info
+++ /dev/null
@@ -1,2 +0,0 @@
-Two COOJA nodes: examples/udp-ipv6/udp-{server,client}.c.
-Test success after 5 replies 
diff --git a/tools/cooja/contiki_tests/crosslevel.info b/tools/cooja/contiki_tests/crosslevel.info
deleted file mode 100644
index 627ae4d89..000000000
--- a/tools/cooja/contiki_tests/crosslevel.info
+++ /dev/null
@@ -1 +0,0 @@
-Cross-level communication test. Cooja+Sky+ESB+App running nullmac and Rime example-abc. Requires compilation in /tools/cooja/examples/appmote_rimeabc.
diff --git a/tools/cooja/contiki_tests/esb_helloworld.info b/tools/cooja/contiki_tests/esb_helloworld.info
deleted file mode 100644
index 2fcda69b4..000000000
--- a/tools/cooja/contiki_tests/esb_helloworld.info
+++ /dev/null
@@ -1 +0,0 @@
-Single ESB mote running Hello world application
diff --git a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.info b/tools/cooja/contiki_tests/ip_cooja_telnet_ping.info
deleted file mode 100644
index b86a8e029..000000000
--- a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.info
+++ /dev/null
@@ -1,2 +0,0 @@
-Five Contiki motes in a line, all running examples/telnet-server/telnet-server.c. Mote 1 (172.16.1.0) is connected to the native network via Native IP Gateway.
-Test succeeds if all five nodes can be pinged from the native network (at least 10/20 ping replies must be received from each mote).
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.info b/tools/cooja/contiki_tests/ip_sky_telnet_ping.info
deleted file mode 100644
index adfae68ca..000000000
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.info
+++ /dev/null
@@ -1 +0,0 @@
-1xSky node: examples/sky-ip/sky-telnet-server.c. Sends 10 pings to 172.16.1.0 via the native IP stack. Test succeeds if more than 5 ping replies are received.   
diff --git a/tools/cooja/contiki_tests/ip_sky_webserver_wget.info b/tools/cooja/contiki_tests/ip_sky_webserver_wget.info
deleted file mode 100644
index 66e37e060..000000000
--- a/tools/cooja/contiki_tests/ip_sky_webserver_wget.info
+++ /dev/null
@@ -1 +0,0 @@
-Four Sky nodes running both the shell and a CFS webserver. Test uses shell commands echo, write, append and wget to generate and transfer files over a multi-hop link. Test uses NULLMAC-
diff --git a/tools/cooja/contiki_tests/multithreading.info b/tools/cooja/contiki_tests/multithreading.info
deleted file mode 100644
index 6c193a03b..000000000
--- a/tools/cooja/contiki_tests/multithreading.info
+++ /dev/null
@@ -1 +0,0 @@
-Single Sky node running examples/multi-threading/multi-threading.c. Waits until both threads have counted up and down 5 times.
diff --git a/tools/cooja/contiki_tests/rime_abc.info b/tools/cooja/contiki_tests/rime_abc.info
deleted file mode 100644
index c247336d2..000000000
--- a/tools/cooja/contiki_tests/rime_abc.info
+++ /dev/null
@@ -1 +0,0 @@
-Two Sky nodes running Rime anonymous broadcast (examples/rime/example-abc.c). Test finishes when both nodes have received more than 30 messages each.
diff --git a/tools/cooja/contiki_tests/rime_collect.info b/tools/cooja/contiki_tests/rime_collect.info
deleted file mode 100644
index a744e6b57..000000000
--- a/tools/cooja/contiki_tests/rime_collect.info
+++ /dev/null
@@ -1 +0,0 @@
-50 Contiki motes running examples/rime/example-collect.c. The sink is randomly created after startup. The test fails if the sink receives less than 8 packets from each node before timeout, or if the sink receives 15 packets from any node (fairness). Test timeout: 600 seconds.
diff --git a/tools/cooja/contiki_tests/rime_collect_sky.info b/tools/cooja/contiki_tests/rime_collect_sky.info
deleted file mode 100644
index 2a4ec514f..000000000
--- a/tools/cooja/contiki_tests/rime_collect_sky.info
+++ /dev/null
@@ -1 +0,0 @@
-Tests the Rime collect primitive on the sky platform, uses the code in examples/rime/example-collect.c
diff --git a/tools/cooja/contiki_tests/rime_rucb.info b/tools/cooja/contiki_tests/rime_rucb.info
deleted file mode 100644
index 95f92712e..000000000
--- a/tools/cooja/contiki_tests/rime_rucb.info
+++ /dev/null
@@ -1 +0,0 @@
-Two OS-level nodes: examples/rime/example-rucb.c. 99% TX success.
diff --git a/tools/cooja/contiki_tests/rime_runicast.info b/tools/cooja/contiki_tests/rime_runicast.info
deleted file mode 100644
index c256fe4f7..000000000
--- a/tools/cooja/contiki_tests/rime_runicast.info
+++ /dev/null
@@ -1 +0,0 @@
-4 Sky nodes running examples/rime/example-runicast.c. Tests both timeout and send acknowledgements.
diff --git a/tools/cooja/contiki_tests/rime_trickle.info b/tools/cooja/contiki_tests/rime_trickle.info
deleted file mode 100644
index 022f377f0..000000000
--- a/tools/cooja/contiki_tests/rime_trickle.info
+++ /dev/null
@@ -1 +0,0 @@
-Rime trickle (test-trickle.c). Ten Sky nodes, node one send message.
diff --git a/tools/cooja/contiki_tests/sky-ipv6-rpl-collect.info b/tools/cooja/contiki_tests/sky-ipv6-rpl-collect.info
deleted file mode 100644
index b483d3a6b..000000000
--- a/tools/cooja/contiki_tests/sky-ipv6-rpl-collect.info
+++ /dev/null
@@ -1 +0,0 @@
-Sky IPv6 RPL test: 24 nodes sending data over UDP to one sink. 10 packets per node should be received.
diff --git a/tools/cooja/contiki_tests/sky_checkpointing.info b/tools/cooja/contiki_tests/sky_checkpointing.info
deleted file mode 100644
index 3fd27a301..000000000
--- a/tools/cooja/contiki_tests/sky_checkpointing.info
+++ /dev/null
@@ -1 +0,0 @@
-Tests node local checkpointing on the Sky platform. A single node checkpoints and rollbacks with a repeating echo background process. Running examples/sky-shell/sky-checkpoint.c 
diff --git a/tools/cooja/contiki_tests/sky_coffee.info b/tools/cooja/contiki_tests/sky_coffee.info
deleted file mode 100644
index 036b4f871..000000000
--- a/tools/cooja/contiki_tests/sky_coffee.info
+++ /dev/null
@@ -1 +0,0 @@
-Single Sky node. Coffee consistency test. 
diff --git a/tools/cooja/contiki_tests/sky_collect.info b/tools/cooja/contiki_tests/sky_collect.info
deleted file mode 100644
index 3b1eb04eb..000000000
--- a/tools/cooja/contiki_tests/sky_collect.info
+++ /dev/null
@@ -1 +0,0 @@
-Sky-collect running on 7 Sky nodes. Test waits until sensor data has been received from every node at least 5 times. If any node successfully transmits 20 packets to the sink, the test fails.
diff --git a/tools/cooja/contiki_tests/sky_deluge.info b/tools/cooja/contiki_tests/sky_deluge.info
deleted file mode 100644
index c2dabbe46..000000000
--- a/tools/cooja/contiki_tests/sky_deluge.info
+++ /dev/null
@@ -1 +0,0 @@
-Three Sky nodes running a Deluge test. examples/sky/test-deluge.c
diff --git a/tools/cooja/contiki_tests/sky_helloworld.info b/tools/cooja/contiki_tests/sky_helloworld.info
deleted file mode 100644
index 5ba2a30c4..000000000
--- a/tools/cooja/contiki_tests/sky_helloworld.info
+++ /dev/null
@@ -1 +0,0 @@
-Single sky mote running Hello world application
diff --git a/tools/cooja/contiki_tests/sky_ipv6_routing.info b/tools/cooja/contiki_tests/sky_ipv6_routing.info
deleted file mode 100644
index d168f9dd0..000000000
--- a/tools/cooja/contiki_tests/sky_ipv6_routing.info
+++ /dev/null
@@ -1 +0,0 @@
-IPv6 multihop routing using Rime route discovery using 5 Sky nodes. Test success when client receives response from server.
diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp.info b/tools/cooja/contiki_tests/sky_ipv6_udp.info
deleted file mode 100644
index 15cc64388..000000000
--- a/tools/cooja/contiki_tests/sky_ipv6_udp.info
+++ /dev/null
@@ -1,2 +0,0 @@
-Two Sky nodes: examples/udp-ipv6/udp-{server,client}.c.
-Test success after 5 replies 
diff --git a/tools/cooja/contiki_tests/sky_shell_basic_commands.info b/tools/cooja/contiki_tests/sky_shell_basic_commands.info
deleted file mode 100644
index b88de7244..000000000
--- a/tools/cooja/contiki_tests/sky_shell_basic_commands.info
+++ /dev/null
@@ -1 +0,0 @@
-Contiki shell on a single Tmote Sky. When the node has booted, a two commands are sent to the shell: help and ps
diff --git a/tools/cooja/contiki_tests/sky_shell_collect.info b/tools/cooja/contiki_tests/sky_shell_collect.info
deleted file mode 100644
index ddfda91a8..000000000
--- a/tools/cooja/contiki_tests/sky_shell_collect.info
+++ /dev/null
@@ -1 +0,0 @@
-Sky shell collect test
diff --git a/tools/cooja/contiki_tests/sky_shell_compilation_test.info b/tools/cooja/contiki_tests/sky_shell_compilation_test.info
deleted file mode 100644
index 7554f5d73..000000000
--- a/tools/cooja/contiki_tests/sky_shell_compilation_test.info
+++ /dev/null
@@ -1 +0,0 @@
-This test tries to compile and run the Contiki shell on the Tmote Sky. The test succeeds when contiki-sky-main.c prints out the word "Contiki".
diff --git a/tools/cooja/contiki_tests/sky_shell_download.info b/tools/cooja/contiki_tests/sky_shell_download.info
deleted file mode 100644
index e76e8b975..000000000
--- a/tools/cooja/contiki_tests/sky_shell_download.info
+++ /dev/null
@@ -1 +0,0 @@
-Tests shell command 'download' (source examples/sky-shell/sky-checkpoint.c): Two nodes generates, appends to, and downloads files from each other. Default netstack + UDGM radio medium 95% 
diff --git a/tools/cooja/contiki_tests/sky_shell_exec_serial.info b/tools/cooja/contiki_tests/sky_shell_exec_serial.info
deleted file mode 100644
index 68a00c836..000000000
--- a/tools/cooja/contiki_tests/sky_shell_exec_serial.info
+++ /dev/null
@@ -1 +0,0 @@
-Tests Contiki ELF loader and shell command 'exec': Hello-world is compiled as a Contiki executable (.ce) and is uploaded to the single Sky node via serial port (base64 encoded). The node then loads and starts the uploaded hello-world application. Test succeeds when the 'Hello, World' output appears
diff --git a/tools/cooja/contiki_tests/sky_shell_sendcmd.info b/tools/cooja/contiki_tests/sky_shell_sendcmd.info
deleted file mode 100644
index 73e08d077..000000000
--- a/tools/cooja/contiki_tests/sky_shell_sendcmd.info
+++ /dev/null
@@ -1 +0,0 @@
-Tests shell command 'sendcmd' (source examples/sky-shell/sky-checkpoint.c): A single node sends echo commands to three other nodes. X-MAC + UDGM radio medium 100%