diff --git a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc b/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
index d8b207e0c..0b90934e1 100644
--- a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
+++ b/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
@@ -1,9 +1,9 @@
 <?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>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -16,14 +16,17 @@
       <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>../../../examples/sky-shell/sky-shell.c</source>
-      <commands>make clean TARGET=sky
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/sky-shell/sky-shell.c</source>
+      <commands EXPORT="discard">make clean TARGET=sky
 make sky-shell.sky TARGET=sky</commands>
-      <firmware>../../../examples/sky-shell/sky-shell.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky-shell/sky-shell.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
@@ -32,12 +35,10 @@ make sky-shell.sky TARGET=sky</commands>
       <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.MspSerial</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
@@ -49,12 +50,13 @@ make sky-shell.sky TARGET=sky</commands>
         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>302</width>
-    <z>0</z>
+    <z>2</z>
     <height>204</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -66,7 +68,7 @@ make sky-shell.sky TARGET=sky</commands>
       <filter />
     </plugin_config>
     <width>690</width>
-    <z>2</z>
+    <z>1</z>
     <height>190</height>
     <location_x>0</location_x>
     <location_y>457</location_y>
@@ -77,12 +79,12 @@ make sky-shell.sky TARGET=sky</commands>
     <plugin_config>
       <script>TIMEOUT(2000, log.log("last message: " + msg + "\n"));
 
-WAIT_UNTIL(msg.startsWith('Contiki'));
+WAIT_UNTIL(msg.contains('Contiki'));
 log.testOK();</script>
       <active>true</active>
     </plugin_config>
     <width>600</width>
-    <z>1</z>
+    <z>0</z>
     <height>458</height>
     <location_x>300</location_x>
     <location_y>-1</location_y>