diff --git a/.circleci/config.yml b/.circleci/config.yml
index ff599a9eeab..998d0698565 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,7 @@ defaults:
       SQLALCHEMY_WARN_20: 1
   pg_image: &pg_image
     # Note, this should be in sync with test-infrastructure/docker-compose.yml
-    image: postgres:10
+    image: postgres:12
     environment:
       POSTGRES_USER: ckan
       POSTGRES_PASSWORD: ckan
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 9e9be6585e1..d64a2b5321b 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       ckan-postgres:
-        image: postgres:10
+        image: postgres:12
         ports:
           - 5432:5432
         options: >-
diff --git a/changes/8289.misc b/changes/8289.misc
new file mode 100644
index 00000000000..9a8bac67b37
--- /dev/null
+++ b/changes/8289.misc
@@ -0,0 +1 @@
+Use postgres 12
diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py
index d66b7e579c1..f838318f3d1 100644
--- a/ckanext/datastore/tests/test_upsert.py
+++ b/ckanext/datastore/tests/test_upsert.py
@@ -758,7 +758,8 @@ def test_insert_wrong_type(self):
 
         with pytest.raises(ValidationError) as context:
             helpers.call_action("datastore_upsert", **data)
-        assert u'invalid input syntax for integer: "notanumber"' in str(context.value)
+        assert 'invalid input syntax for ' in str(context.value)
+        assert ' integer: "notanumber"' in str(context.value)
 
 
 @pytest.mark.ckan_config("ckan.plugins", "datastore")
diff --git a/doc/maintaining/installing/install-from-source.rst b/doc/maintaining/installing/install-from-source.rst
index 34f9d77b036..62257ed2d86 100644
--- a/doc/maintaining/installing/install-from-source.rst
+++ b/doc/maintaining/installing/install-from-source.rst
@@ -37,7 +37,7 @@ wiki page for help):
 Package                Description
 =====================  ===============================================
 Python                 `The Python programming language, v3.9 or newer <https://www.python.org/getit/>`_
-|postgres|             `The PostgreSQL database system, v10 or newer <https://www.postgresql.org/docs/10/libpq.html>`_
+|postgres|             `The PostgreSQL database system, v12 or newer <https://www.postgresql.org/docs/10/libpq.html>`_
 libpq                  `The C programmer's interface to PostgreSQL <http://www.postgresql.org/docs/8.1/static/libpq.html>`_
 pip                    `A tool for installing and managing Python packages <https://pip.pypa.io/en/stable/>`_
 python3-venv           `The Python3 virtual environment builder (or for Python 2 use 'virtualenv' instead) <https://virtualenv.pypa.io/en/latest/>`_
diff --git a/test-infrastructure/docker-compose.yml b/test-infrastructure/docker-compose.yml
index f386ccd683d..caace119d18 100644
--- a/test-infrastructure/docker-compose.yml
+++ b/test-infrastructure/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3"
 networks:
   default:
 volumes:
@@ -8,7 +7,7 @@ services:
   ckan-postgres:
     networks:
       - default
-    image: "postgres:10"
+    image: "postgres:12"
     environment:
       POSTGRES_USER: ckan
       POSTGRES_PASSWORD: ckan