diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b413a0c86566f5bf6bf81a14fd121d62519be12f..1ad7f3ecca4b104f17e0a4cd9f210aee001614bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,8 +55,9 @@ test metager3:
   script:
     - cd ~/MetaGer_neu 
     - sh test.sh
-    - kill $browserstackPid
-    - kill $servePid
+  after_script:
+    - kill `cat ~/browserstackPid` && rm ~/browserstackPid
+    - kill `cat ~/servePid` && rm ~/servePid
 
 deploy metager3:
   stage: deploy
diff --git a/test.sh b/test.sh
index 0e111881479a82d2527883977c9b2938aa8c6bb4..3b6c495e4903e8e399041a879d06a8f0bd1dcdda 100644
--- a/test.sh
+++ b/test.sh
@@ -5,12 +5,14 @@ set -e
 cd ~/MetaGer_neu
 
 # Start Webserver
-php artisan serve --port 8005 >/dev/null 2>&1 &
-servePid=$!
+nohup php artisan serve --port 8005 >/dev/null 2>&1 &
+echo $! > ~/servePid
+disown
 
 # Start the Browserstack Proxy
 ~/BrowserStackLocal --key gCyHqmJnNwLhp96LgiVG 2>&1 &
-browserstackPid=$!
+echo $! > ~/browserstackPid
+disown
 sleep 5
 
 ./vendor/bin/phpunit
\ No newline at end of file