diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
index 6fc5615d565..5df55a6e679 100755
--- a/.ci/travis/linux/docker-build-test.sh
+++ b/.ci/travis/linux/docker-build-test.sh
@@ -2,6 +2,11 @@
 
 set -e
 
+# locale-gen en_US.UTF-8
+# export LANG=en_US.UTF-8
+# export LANGUAGE=en_US:en
+# export LC_ALL=en_US.UTF-8
+
 export CTEST_PARALLEL_LEVEL=1
 export CCACHE_TEMPDIR=/tmp
 ccache -M 500M
@@ -9,10 +14,15 @@ ccache -z
 
 cd /root/QGIS
 
-printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=docker\nuser=docker\npassword=docker" > ~/.pg_service.conf
+sleep 20
+
+printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf
 export PGUSER=docker
 export PGHOST=postgres
 export PGPASSWORD=docker
+export PGDATABASE=qgis_test
+
+# export PYTHONIOENCODING="utf-8"
 
 /root/QGIS/tests/testdata/provider/testdata_pg.sh
 
@@ -37,7 +47,6 @@ cmake \
  -DCXX_EXTRA_FLAGS=${CLANG_WARNINGS} ..
 
 export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
-
 export CTEST_BUILD_COMMAND="/usr/bin/ninja"
 
 ninja
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 74986a16ece..35c93076141 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -105,4 +105,9 @@ ENV QT_SELECT=5
 
 RUN apt-get install -y git
 
+# RUN locale-gen en_US.UTF-8
+# ENV LANG=en_US.UTF-8
+# ENV LANGUAGE=en_US:en
+# ENV LC_ALL=en_US.UTF-8
+
 CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml
index 0816b68ede8..ea613df9b7f 100644
--- a/.docker/docker-compose.travis.yml
+++ b/.docker/docker-compose.travis.yml
@@ -2,9 +2,11 @@ version: '3'
 services:
   postgres:
     image: kartoza/postgis:9.5-2.2
-    command: sh -c "echo \"host all all 172.18.0.0/16 md5\" >> /etc/postgresql/9.5/main/pg_hba.conf && /start-postgis.sh"
+    environment:
+      - ALLOW_IP_RANGE="172.18.0.0/16"
 
   qgis-deps:
+    tty: true
     image: qgis/qgis3-build-deps:${DOCKER_TAG}
     volumes:
       - ${TRAVIS_BUILD_DIR}:/root/QGIS
diff --git a/tests/testdata/provider/testdata_pg.sh b/tests/testdata/provider/testdata_pg.sh
index a996477d577..74cbf0b5f93 100755
--- a/tests/testdata/provider/testdata_pg.sh
+++ b/tests/testdata/provider/testdata_pg.sh
@@ -14,5 +14,5 @@ SCRIPTS="
 dropdb qgis_test 2> /dev/null || true
 createdb qgis_test || exit 1
 for f in ${SCRIPTS}; do
-  psql --echo-errors -f $f qgis_test -v ON_ERROR_STOP=1
+  psql -q --echo-errors -f $f qgis_test -v ON_ERROR_STOP=1
 done