diff --git a/regression-tests/02-hello-world/01-hello-world-cooja.csc b/regression-tests/02-hello-world/01-hello-world-cooja.csc.flaky
similarity index 97%
rename from regression-tests/02-hello-world/01-hello-world-cooja.csc
rename to regression-tests/02-hello-world/01-hello-world-cooja.csc.flaky
index ce8961801..ca1d88005 100644
--- a/regression-tests/02-hello-world/01-hello-world-cooja.csc
+++ b/regression-tests/02-hello-world/01-hello-world-cooja.csc.flaky
@@ -1,100 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>Hello World test (Cooja motes)</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.contikimote.ContikiMoteType
-      <identifier>mtype725</identifier>
-      <description>Contiki Mote Type #1</description>
-      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
-      <commands>make hello-world.cooja TARGET=cooja</commands>
-      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
-      <symbols>false</symbols>
-    </motetype>
-    <mote>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>69.64867743029201</x>
-        <y>69.2570131081022</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>1</id>
-      </interface_config>
-      <motetype_identifier>mtype725</motetype_identifier>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
-      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 59.68302051791636 6.039078992634368</viewport>
-    </plugin_config>
-    <width>259</width>
-    <z>1</z>
-    <height>198</height>
-    <location_x>2</location_x>
-    <location_y>203</location_y>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-    </plugin_config>
-    <width>259</width>
-    <z>2</z>
-    <height>217</height>
-    <location_x>2</location_x>
-    <location_y>403</location_y>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>259</width>
-    <z>3</z>
-    <height>200</height>
-    <location_x>2</location_x>
-    <location_y>3</location_y>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
-      <active>true</active>
-    </plugin_config>
-    <width>592</width>
-    <z>0</z>
-    <height>618</height>
-    <location_x>318</location_x>
-    <location_y>61</location_y>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World test (Cooja motes)</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.contikimote.ContikiMoteType
+      <identifier>mtype725</identifier>
+      <description>Contiki Mote Type #1</description>
+      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands>make hello-world.cooja TARGET=cooja</commands>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>69.64867743029201</x>
+        <y>69.2570131081022</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>mtype725</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
+      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 59.68302051791636 6.039078992634368</viewport>
+    </plugin_config>
+    <width>259</width>
+    <z>1</z>
+    <height>198</height>
+    <location_x>2</location_x>
+    <location_y>203</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>259</width>
+    <z>2</z>
+    <height>217</height>
+    <location_x>2</location_x>
+    <location_y>403</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>259</width>
+    <z>3</z>
+    <height>200</height>
+    <location_x>2</location_x>
+    <location_y>3</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>592</width>
+    <z>0</z>
+    <height>618</height>
+    <location_x>318</location_x>
+    <location_y>61</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/06-shell/04-sky-shell-download.csc b/regression-tests/06-shell/04-sky-shell-download.csc.fails
similarity index 100%
rename from regression-tests/06-shell/04-sky-shell-download.csc
rename to regression-tests/06-shell/04-sky-shell-download.csc.fails