diff --git a/.travis.yml b/.travis.yml
index 73119057d..d474a7142 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ language: java
 before_script:
   - chmod 777 ./tests/travis/setup_arangodb.sh
   - ./tests/travis/setup_arangodb.sh
+
+after_script:  
+  - killall -9 arangod
   
 install: mvn install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true -B -V
 
diff --git a/tests/travis/setup_arangodb.sh b/tests/travis/setup_arangodb.sh
index 3e1f24748..a4c6ce749 100755
--- a/tests/travis/setup_arangodb.sh
+++ b/tests/travis/setup_arangodb.sh
@@ -36,10 +36,6 @@ ${ARANGOD} \
     --javascript.startup-directory ${ARANGODB_DIR}/js \
     --server.authentication=true &
 
-ARANGOD_PID="$!"
-echo "pid is $ARANGOD_PID"
-trap "echo 'shutting down arangod'; kill -TERM $ARANGOD_PID; sleep 5" exit TERM HUP INT
-
 sleep 2
 
 echo "Check for arangod process"