diff --git a/.travis.yml b/.travis.yml
index 050283e5a..b9b5ceadb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,8 +24,7 @@ install:
 
 # Generate a self-signed X.509 certificate for TLS.
 before_script:
- - if [[ "$TEST_SUITE" == "integ-test" ]]; then openssl req -x509 -newkey rsa:512 -keyout server.key -out server.crt -days 365 -nodes -subj /CN=localhost; fi
- - if [[ "$TEST_SUITE" == "integ-test" ]]; then ./scripts/install-local-kafka.sh; fi
+ - if [[ "${TEST_SUITE:-integ-test}" == "integ-test" ]]; then ./scripts/install-local-kafka.sh; fi
 
 script:
  - ./scripts/travis-test.sh
diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh
index 922ac7836..782581422 100755
--- a/scripts/travis-test.sh
+++ b/scripts/travis-test.sh
@@ -42,6 +42,9 @@ if [ "${TEST_SUITE:-integ-test}" == "integ-test" ]; then
     gb build github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests
     gb build github.com/matrix-org/dendrite/cmd/client-api-proxy
 
+    # Create necessary certificates and keys to run dendrite
+    openssl req -x509 -newkey rsa:512 -keyout server.key -out server.crt -days 365 -nodes -subj /CN=localhost
+
     # Run the integration tests
     bin/roomserver-integration-tests
     bin/syncserver-integration-tests