diff --git a/tests/frontend/travis/runner.sh b/tests/frontend/travis/runner.sh
index 3dc372792..73d04e296 100755
--- a/tests/frontend/travis/runner.sh
+++ b/tests/frontend/travis/runner.sh
@@ -45,6 +45,6 @@ node remote_runner.js
 exit_code=$?
 
 kill $(cat /tmp/sauce.pid)
-kill $ep_pid
+kill "$ep_pid" && wait "$ep_pid"
 
 exit $exit_code
diff --git a/tests/frontend/travis/runnerBackend.sh b/tests/frontend/travis/runnerBackend.sh
index 12ab8523a..806fe8cf1 100755
--- a/tests/frontend/travis/runnerBackend.sh
+++ b/tests/frontend/travis/runnerBackend.sh
@@ -24,6 +24,7 @@ sed 's/\"points\": 10/\"points\": 1000/g' settings.json.rateLimit > settings.jso
 # a call to bin/installDeps.sh
 echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run"
 node node_modules/ep_etherpad-lite/node/server.js "${@}" &
+ep_pid=$!
 
 echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001"
 
@@ -43,5 +44,5 @@ cd src
 
 failed=0
 npm run test || failed=1
-
+kill "$ep_pid" && wait "$ep_pid"
 exit $failed
diff --git a/tests/frontend/travis/runnerLoadTest.sh b/tests/frontend/travis/runnerLoadTest.sh
index 2ede86a23..8fe854321 100755
--- a/tests/frontend/travis/runnerLoadTest.sh
+++ b/tests/frontend/travis/runnerLoadTest.sh
@@ -21,6 +21,7 @@ sed 's/\"loadTest\": false,/\"loadTest\": true,/g' settings.json.points > settin
 echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run"
 
 node node_modules/ep_etherpad-lite/node/server.js "${@}" &
+ep_pid=$!
 
 echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001"
 
@@ -45,7 +46,7 @@ echo "Now run the load tests for 25 seconds and if it stalls before 100 then err
 etherpad-loadtest -d 25
 exit_code=$?
 
-kill $!
+kill "$ep_pid" && wait "$ep_pid"
 sleep 5
 
 exit $exit_code