diff --git a/pycodestyle211.patch b/pycodestyle211.patch
new file mode 100644
index 0000000..e4336e5
--- /dev/null
+++ b/pycodestyle211.patch
@@ -0,0 +1,30 @@
+From f961833919a6cc9198f05a7f1b2ac7eec1584724 Mon Sep 17 00:00:00 2001
+From: paugier <pierre.augier@univ-grenoble-alpes.fr>
+Date: Sun, 13 Aug 2023 23:06:33 +0200
+Subject: [PATCH] Try to fix an AttributeError related to pycodestyle 2.11.0
+
+---
+ autopep8.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/autopep8.py b/autopep8.py
+index 5e2a9fda..84e3e1bf 100755
+--- a/autopep8.py
++++ b/autopep8.py
+@@ -757,8 +757,14 @@ def fix_e225(self, result):
+                 return
+             if not check_syntax(fixed.lstrip()):
+                 return
+-            errors = list(
+-                pycodestyle.missing_whitespace_around_operator(fixed, ts))
++            try:
++                _missing_whitespace = (
++                    pycodestyle.missing_whitespace_around_operator
++                )
++            except AttributeError:
++                # pycodestyle >= 2.11.0
++                _missing_whitespace = pycodestyle.missing_whitespace
++            errors = list(_missing_whitespace(fixed, ts))
+             for e in reversed(errors):
+                 if error_code != e[1].split()[0]:
+                     continue
diff --git a/python-autopep8.changes b/python-autopep8.changes
index 59aeb44..6425747 100644
--- a/python-autopep8.changes
+++ b/python-autopep8.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 25 11:29:01 UTC 2023 - Markéta Machová <mmachova@suse.com>
+
+- Add pycodestyle211.patch to fix tests
+
 -------------------------------------------------------------------
 Mon Mar 13 08:44:47 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-autopep8.spec b/python-autopep8.spec
index 4e10e50..6243975 100644
--- a/python-autopep8.spec
+++ b/python-autopep8.spec
@@ -24,6 +24,8 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/hhatto/autopep8
 Source:         https://files.pythonhosted.org/packages/source/a/autopep8/autopep8-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/hhatto/autopep8/pull/699 Try to fix an AttributeError related to pycodestyle 2.11.0
+Patch0:         pycodestyle211.patch
 BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pycodestyle >= 2.8}