diff --git a/postgresql-subtransaction-test.patch b/postgresql-subtransaction-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e470e18da996986a1b2fc587d7b658f3556e4e95
--- /dev/null
+++ b/postgresql-subtransaction-test.patch
@@ -0,0 +1,56 @@
+Fix subtransaction test for Python 3.10
+
+Starting with Python 3.10, the stacktrace looks differently:
+  -  PL/Python function "subtransaction_exit_subtransaction_in_with", line 3, in <module>
+  -    s.__exit__(None, None, None)
+  +  PL/Python function "subtransaction_exit_subtransaction_in_with", line 2, in <module>
+  +    with plpy.subtransaction() as s:
+Using try/except specifically makes the error look always the same.
+
+RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1959080
+
+diff -up postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out.patchnew postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out
+--- postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out.patchnew	2021-02-08 22:54:11.000000000 +0100
++++ postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out	2021-05-11 21:04:25.085586012 +0200
+@@ -171,8 +171,11 @@ with plpy.subtransaction() as s:
+ $$ LANGUAGE plpythonu;
+ CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void
+ AS $$
+-with plpy.subtransaction() as s:
+-    s.__exit__(None, None, None)
++try:
++    with plpy.subtransaction() as s:
++        s.__exit__(None, None, None)
++except ValueError as e:
++    raise ValueError(e)
+ $$ LANGUAGE plpythonu;
+ SELECT subtransaction_exit_without_enter();
+ ERROR:  ValueError: this subtransaction has not been entered
+@@ -224,8 +227,8 @@ PL/Python function "subtransaction_enter
+ SELECT subtransaction_exit_subtransaction_in_with();
+ ERROR:  ValueError: this subtransaction has already been exited
+ CONTEXT:  Traceback (most recent call last):
+-  PL/Python function "subtransaction_exit_subtransaction_in_with", line 3, in <module>
+-    s.__exit__(None, None, None)
++  PL/Python function "subtransaction_exit_subtransaction_in_with", line 6, in <module>
++    raise ValueError(e)
+ PL/Python function "subtransaction_exit_subtransaction_in_with"
+ -- Make sure we don't get a "current transaction is aborted" error
+ SELECT 1 as test;
+diff -up postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql.patchnew postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql
+--- postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql.patchnew	2021-02-08 22:54:11.000000000 +0100
++++ postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql	2021-05-11 21:02:34.386415376 +0200
+@@ -121,8 +121,11 @@ $$ LANGUAGE plpythonu;
+ 
+ CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void
+ AS $$
+-with plpy.subtransaction() as s:
+-    s.__exit__(None, None, None)
++try:
++    with plpy.subtransaction() as s:
++        s.__exit__(None, None, None)
++except ValueError as e:
++    raise ValueError(e)
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT subtransaction_exit_without_enter();
diff --git a/postgresql.spec b/postgresql.spec
index 6294a9cdc151454dc425d7cec9ef74367b71ce2a..fd4e97ed5299a34370677b6574a16174db11120d 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -27,7 +27,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
 Version: %{majorversion}.3
-Release: 3
+Release: 4
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -71,6 +71,7 @@ Patch8: postgresql-external-libpq.patch
 Patch9: postgresql-server-pg_config.patch
 Patch10: postgresql-no-libecpg.patch
 Patch11: postgresql-datalayout-mismatch-on-s390.patch
+Patch12: postgresql-subtransaction-test.patch
 
 BuildRequires: gcc
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -343,6 +344,7 @@ goal of accelerating analytics queries.
 %endif
 %patch9 -p1
 %patch11 -p1
+%patch12 -p1
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -1223,6 +1225,9 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Fri May 6 2022 caodongxia <caodongxia@h-partners.com> - 13.3-4
+- Fix subtransaction test failed
+
 * Tue Aug 3 2021 bzhaoop<bzhaojyathousandy@gmail.com> - 13.3-3
 - Add the missed libpq.so file into postgresql-server-devel package.