diff --git a/riot/start.sh b/riot/start.sh
index 3892a80a48..8e7e742f98 100755
--- a/riot/start.sh
+++ b/riot/start.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-PORT=8080
+PORT=5000
 echo "running riot on http://localhost:$PORT..."
 BASE_DIR=$(readlink -f $(dirname $0))
 cd $BASE_DIR/
diff --git a/start.js b/start.js
index 5e14539bfc..05f4df9d0c 100644
--- a/start.js
+++ b/start.js
@@ -25,11 +25,10 @@ const acceptServerNoticesInviteAndConsent = require('./tests/server-notices-cons
 
 const homeserver = 'http://localhost:8008';
 
-global.riotserver = 'http://localhost:8080';
+global.riotserver = 'http://localhost:5000';
 global.browser = null;
 
 async function runTests() {
-  process.exit(-1);
   console.log("running tests ...");
   const options = {};
   if (process.env.CHROME_PATH) {