diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh
index a472d975..db72bbc9 100755
--- a/scripts/travis-test.sh
+++ b/scripts/travis-test.sh
@@ -39,6 +39,11 @@ function travis_end {
     echo -en "travis_fold:end:$name\r"
 }
 
+function kill_kafka {
+    ./kafka/bin/kafka-server-stop.sh || true
+    ./kafka/bin/zookeeper-server-stop.sh || true
+}
+
 if [ "${TEST_SUITE:-lint}" == "lint" ]; then
     ./scripts/find-lint.sh
 fi
@@ -77,6 +82,11 @@ if [ "${TEST_SUITE:-integ-test}" == "integ-test" ]; then
     ./scripts/install-local-kafka.sh
     travis_end
 
+    # make sure we kill off zookeeper/kafka on exit, because it stops the
+    # travis container being cleaned up (cf
+    # https://github.com/travis-ci/travis-ci/issues/8082)
+    trap kill_kafka EXIT
+
     # Run the integration tests
     for i in roomserver syncserver mediaapi; do
         travis_start "$i-integration-tests" "Running integration tests for $i"