diff --git a/.travis.yml b/.travis.yml
index 462e8a9..351c3fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: true
-dist: trusty
+dist: bionic
 language: c
 compiler: gcc
 matrix:
@@ -10,17 +10,24 @@ matrix:
   - env: PG=9.6
   - env: PG=10
   - env: PG=11
+  - env: PG=12
+  - env: PG=13
+branches:
+  only:
+  - master
+  - /^v\d+\.\d+(\.\d+)?$/
 before_install:
-  - sudo pg_dropcluster --stop 9.6 main
   - sudo service postgresql stop
   - sudo sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf
-  - if ! sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install postgresql-$PG postgresql-server-dev-$PG libevent-dev pv; then echo; fi
+  - if [ $PG = 13 ]; then sudo sed -i -e "s/main/main $PG/" /etc/apt/sources.list.d/pgdg*.list && sudo apt-get -qq update; fi
+  - if ! sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install postgresql-$PG postgresql-server-dev-$PG; then echo; fi
   - sudo pip install --upgrade cpp-coveralls
 script:
   - |
     set -e
     export PATH=/usr/lib/postgresql/$PG/bin:$PATH
-    sudo make USE_PGXS=1 ENABLE_GCOV=1 install
+    sudo PATH=$PATH make USE_PGXS=1 ENABLE_GCOV=1 install
+    sudo PATH=$PATH make USE_PGXS=1 ENABLE_GCOV=1 with_llvm=no clean all install
     bash -x test.sh
 after_success:
     - coveralls --gcov-options '\-lr'
diff --git a/pg_auth_mon.c b/pg_auth_mon.c
index addeddb..b7f48c7 100644
--- a/pg_auth_mon.c
+++ b/pg_auth_mon.c
@@ -17,12 +17,10 @@
 #include "libpq/libpq-be.h"
 #include "port.h"
 #include "miscadmin.h"
+#include "access/hash.h"
 #include "storage/lwlock.h"
 #include "storage/ipc.h"
 #include "storage/shmem.h"
-#if PG_VERSION_NUM >= 100000
-#include "utils/hashutils.h"
-#endif
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
 #include "utils/tuplestore.h"