diff --git a/tests/07-simulation-base/01-hello-world-sky.csc b/tests/07-simulation-base/01-hello-world-sky.csc
index a79c4cf5d..050631b70 100644
--- a/tests/07-simulation-base/01-hello-world-sky.csc
+++ b/tests/07-simulation-base/01-hello-world-sky.csc
@@ -50,7 +50,7 @@
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/hello-world.js</scriptfile>
       <active>true</active>
     </plugin_config>
     <width>541</width>
diff --git a/tests/07-simulation-base/fragmentation-should-receive-all.js b/tests/07-simulation-base/fragmentation-should-receive-all.js
deleted file mode 100644
index b6ad2dbd8..000000000
--- a/tests/07-simulation-base/fragmentation-should-receive-all.js
+++ /dev/null
@@ -1,23 +0,0 @@
-TIMEOUT(200000, log.log("last message: " + msg + "\n"));
-
-data = 0;
-alive = 0;
-while(true) {
-    YIELD();
-    if(msg.startsWith('Data')) {
-        data++;
-        log.log("Heard " + data + " data messages\n");
-    }
-    if(msg.startsWith('Alive')) {
-        alive++;
-        log.log("Heard " + alive + " alive messages\n");
-    }
-    if(data == 10 && alive == 10) {
-        if(msg.startsWith('Data 10') ||
-           msg.startsWith('Alive 10')) {
-            log.testOK();
-        } else {
-            log.testError();
-        }
-    }
-}
diff --git a/tests/07-simulation-base/fragmentation-should-receive-none.js b/tests/07-simulation-base/fragmentation-should-receive-none.js
deleted file mode 100644
index 6a04bbf4f..000000000
--- a/tests/07-simulation-base/fragmentation-should-receive-none.js
+++ /dev/null
@@ -1,22 +0,0 @@
-TIMEOUT(200000, log.log("last message: " + msg + "\n"));
-
-data = 0;
-alive = 0;
-while(true) {
-    YIELD();
-    if(msg.startsWith('Data')) {
-        data++;
-        log.log("Heard " + data + " data messages\n");
-    }
-    if(msg.startsWith('Alive')) {
-        alive++;
-        log.log("Heard " + alive + " alive messages\n");
-    }
-    if(data == 0 && alive == 10) {
-        if(msg.startsWith('Alive 10')) {
-            log.testOK();
-        } else {
-            log.testError();
-        }
-    }
-}
diff --git a/tests/07-simulation-base/hello-world.js b/tests/07-simulation-base/js/hello-world.js
similarity index 100%
rename from tests/07-simulation-base/hello-world.js
rename to tests/07-simulation-base/js/hello-world.js