diff --git a/failing_test_subparser_invalid_option.patch b/failing_test_subparser_invalid_option.patch
new file mode 100644
index 0000000..03b8bfc
--- /dev/null
+++ b/failing_test_subparser_invalid_option.patch
@@ -0,0 +1,15 @@
+---
+ tests/user_commands/tests.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tests/user_commands/tests.py
++++ b/tests/user_commands/tests.py
+@@ -334,7 +334,7 @@ class CommandTests(SimpleTestCase):
+         self.assertIn('bar', out.getvalue())
+ 
+     def test_subparser_invalid_option(self):
+-        msg = "Error: invalid choice: 'test' (choose from 'foo')"
++        msg = "invalid choice: 'test' (choose from 'foo')"
+         with self.assertRaisesMessage(CommandError, msg):
+             management.call_command('subparser', 'test', 12)
+         if PY37:
diff --git a/python-Django.changes b/python-Django.changes
index db3f7fd..25fb735 100644
--- a/python-Django.changes
+++ b/python-Django.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep  9 15:21:45 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Add failing_test_subparser_invalid_option.patch fixing
+  https://code.djangoproject.com/ticket/33082
+
 -------------------------------------------------------------------
 Wed Sep  1 10:13:34 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com>
 
diff --git a/python-Django.spec b/python-Django.spec
index 5dec4b8..e909d67 100644
--- a/python-Django.spec
+++ b/python-Django.spec
@@ -32,6 +32,10 @@ Source:         https://www.djangoproject.com/m/releases/3.2/Django-%{version}.t
 Source1:        https://www.djangoproject.com/m/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source99:       python-Django-rpmlintrc
+# PATCH-FIX-UPSTREAM failing_test_subparser_invalid_option.patch https://code.djangoproject.com/ticket/33082 mcepl@suse.com
+# fixes test_subparser_invalid_option regression with Python 3.9.7
+# Patch from https://github.com/django/django/commit/b61f44c339830ea53663415f00cbd17e2fd5aa43
+Patch0:         failing_test_subparser_invalid_option.patch
 BuildRequires:  %{python_module Jinja2 >= 2.9.2}
 BuildRequires:  %{python_module Pillow}
 BuildRequires:  %{python_module PyYAML}