diff --git a/.travis.yml b/.travis.yml
index 42a00430..0c4ae275 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 language:
     - c
@@ -14,6 +14,8 @@ addons:
     - gcc-6
     - python-docutils
     - python3-pip
+    - python3-setuptools
+    - ninja-build
 install: test/travis-install.sh
 script: test/travis-build.sh
 
diff --git a/test/travis-install.sh b/test/travis-install.sh
index 9a46719f..23cc0add 100755
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -4,11 +4,6 @@ set -e
 
 # Meson 0.45 requires Python 3.5 or newer
 sudo python3 -m pip install pytest meson==0.44
-wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
-unzip ninja-linux.zip
-chmod 755 ninja
-sudo chown root:root ninja
-sudo mv -fv ninja /usr/local/bin
 valgrind --version
 ninja --version
 meson --version
@@ -29,7 +24,7 @@ ls -d1 /usr/local/lib/*-linux-gnu | sudo tee /etc/ld.so.conf.d/usrlocal.conf
 sudo ldconfig
 
 # Setup ssh
-ssh-keygen -b 768 -t rsa -f ~/.ssh/id_rsa -P ''
+ssh-keygen -b 1024 -t rsa -f ~/.ssh/id_rsa -P ''
 cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 chmod 600 ~/.ssh/authorized_keys
 ssh -o "StrictHostKeyChecking=no" localhost echo "SSH connection succeeded"