diff --git a/.travis.yml b/.travis.yml
index 45189e8..80d5de7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,9 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=16 LEVEL=nightmare
+    - PG_VERSION=16 LEVEL=hardcore
+    - PG_VERSION=16
     - PG_VERSION=15 LEVEL=nightmare
     - PG_VERSION=15 LEVEL=hardcore
     - PG_VERSION=15
@@ -44,3 +47,4 @@ matrix:
         - env: PG_VERSION=13 LEVEL=nightmare
         - env: PG_VERSION=14 LEVEL=nightmare
         - env: PG_VERSION=15 LEVEL=nightmare
+        - env: PG_VERSION=16 LEVEL=nightmare
diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 0bcd176..2792b6e 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -6,7 +6,7 @@ RUN apk add --no-cache \
 	perl perl-ipc-run \
 	make musl-dev gcc bison flex coreutils \
 	zlib-dev libedit-dev linux-headers \
-	clang clang-analyzer;
+	pkgconf icu-dev clang clang15 clang-analyzer;
 
 # Install fresh valgrind
 RUN apk add valgrind \