diff --git a/.travis.yml b/.travis.yml
index 9872cf3..b02f94f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,28 @@
 language: c
-dist: bionic
 
-before_install:
-  - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-  - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" >> /etc/apt/sources.list.d/postgresql.list'
-  - sudo apt-get update
-  - sudo apt-get install -q postgresql-server-dev-12 libcunit1-dev valgrind
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update -qq
-
-install:
-  - sudo apt-get install -qq g++
-  - export CXX="g++"
-  - sh .install-lazperf.sh
-  - npm install -g eclint@1.1.5
-
-addons:
-  postgresql: "12" # for "installcheck"
-  apt:
-    packages:
-      - postgresql-12-postgis-3
-
-# Note: Valgrind currently reports many problems when libght is enabled. So for
-# now, and until the problems are fixed, we just run the unit tests with libght
-# enabled.
+jobs:
+  include:
+    - env: POSTGRESQL_VERSION="9.6" POSTGIS_VERSION="2.5"
+      dist: xenial
 
 script:
+  - sudo service postgresql stop
+  - sudo apt-get remove postgresql* -y
+  - sudo apt-get install -q postgresql-server-dev-$POSTGRESQL_VERSION postgresql-client-$POSTGRESQL_VERSION postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION libcunit1-dev valgrind g++
+  - sudo pg_dropcluster --stop $POSTGRESQL_VERSION main
+  - sudo rm -rf /etc/postgresql/$POSTGRESQL_VERSION /var/lib/postgresql/$POSTGRESQL_VERSION
+  - sudo pg_createcluster -u postgres $POSTGRESQL_VERSION main -- --auth-local trust --auth-host password
+  - sudo /etc/init.d/postgresql start $POSTGRESQL_VERSION || sudo journalctl -xe
+  - psql -c 'CREATE ROLE travis SUPERUSER LOGIN CREATEDB;' -U postgres
+  - nvm install 8
+  - npm install -g eclint@1.1.5
   - eclint check * */* */cunit/*
+  - sh .install-lazperf.sh
   - ./tools/build-install.sh # test compilation without lazperf
   - ./tools/build-install.sh --with-lazperf=/usr/local && make check && ./tools/valgrind.sh
   - make installcheck || { cat pgsql/regression.diffs && false; }
   - (cd tools/benchmark_compression && sh compression_benchmark.sh)
+
+after_failure:
+  - cat pgsql/regression.out
+  - cat pgsql/regression.diffs