diff --git a/.travis.yml b/.travis.yml
index d26f3ac..ae90f16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,13 @@
+dist: xenial
 language: c
-before_install:
-  - wget https://gist.github.com/petere/5893799/raw/apt.postgresql.org.sh
-  - wget https://gist.github.com/petere/6023944/raw/pg-travis-test.sh
-  - sudo sh ./apt.postgresql.org.sh
-install:
-  - sudo apt-get install -qq liburiparser-dev
+addons:
+  apt:
+    sources:
+      - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main'
+        key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
+    update: true
+    packages:
+      - liburiparser-dev
 env:
   - PGVERSION=9.1
   - PGVERSION=9.2
@@ -14,5 +17,11 @@ env:
   - PGVERSION=9.6
   - PGVERSION=10
   - PGVERSION=11
-script:
-  - bash ./pg-travis-test.sh
+script: |
+  set -e
+  PATH=/usr/lib/postgresql/$PGVERSION/bin:$PATH
+  sudo apt-get install postgresql-$PGVERSION postgresql-server-dev-$PGVERSION
+  sudo pg_createcluster --start $PGVERSION test -p 55435 -- -A trust
+  make all
+  sudo make install
+  PGPORT=55435 make installcheck PGUSER=postgres