diff --git a/python-aiohttp.changes b/python-aiohttp.changes
index f310e02..6c0bed7 100644
--- a/python-aiohttp.changes
+++ b/python-aiohttp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  8 21:10:23 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Add python39-failures.patch to fix test problems with Python 3.9.7+
+  (gh#aio-libs/aiohttp#5991).
+
 -------------------------------------------------------------------
 Tue Jun  8 19:15:11 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-aiohttp.spec b/python-aiohttp.spec
index 60aa571..3425bda 100644
--- a/python-aiohttp.spec
+++ b/python-aiohttp.spec
@@ -29,6 +29,9 @@ Patch0:         unbundle-http-parser.patch
 # PATCH-FIX-UPSTREAM stdlib-typing_extensions.patch gh#aio-libs/aiohttp#5374 mcepl@suse.com
 # Fix typing_extensions imports.
 Patch1:         stdlib-typing_extensions.patch
+# PATCH-FIX-UPSTREAM python39-failures.patch gh#aio-libs/aiohttp#5991 mcepl@suse.com
+# Test problems Python 3.9.7+
+Patch2:         python39-failures.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module async_timeout >= 3.0}
 BuildRequires:  %{python_module attrs >= 17.3.0}
diff --git a/python39-failures.patch b/python39-failures.patch
new file mode 100644
index 0000000..6f21314
--- /dev/null
+++ b/python39-failures.patch
@@ -0,0 +1,77 @@
+---
+ tests/test_web_middleware.py |   27 ++++++++++++++++++++++-----
+ 1 file changed, 22 insertions(+), 5 deletions(-)
+
+--- a/tests/test_web_middleware.py
++++ b/tests/test_web_middleware.py
+@@ -1,4 +1,5 @@
+ import re
++import sys
+ from typing import Any
+ 
+ import pytest
+@@ -6,6 +7,7 @@ from yarl import URL
+ 
+ from aiohttp import web
+ 
++py39 = sys.version_info[:3] >= (3, 9, 7)
+ 
+ async def test_middleware_modifies_response(loop, aiohttp_client) -> None:
+     async def handler(request):
+@@ -410,7 +412,10 @@ async def test_old_style_middleware(loop
+         txt = await resp.text()
+         assert "OK[old style middleware]" == txt
+ 
+-    assert len(warning_checker) == 1
++    if py39:
++        assert len(warning_checker) == 2
++    else:
++        assert len(warning_checker) == 1
+     msg = str(warning_checker.list[0].message)
+     assert re.match(
+         "^old-style middleware "
+@@ -464,7 +469,10 @@ async def test_mixed_middleware(loop, ai
+         txt = await resp.text()
+         assert "OK[new style 2][old style 2][new style 1][old style 1]" == txt
+ 
+-    assert len(w) == 2
++    if py39:
++        assert len(w) == 3
++    else:
++        assert len(w) == 2
+     tmpl = (
+         "^old-style middleware "
+         '"<function test_mixed_middleware.<locals>.'
+@@ -503,7 +511,10 @@ async def test_old_style_middleware_clas
+         txt = await resp.text()
+         assert "OK[old style middleware]" == txt
+ 
+-    assert len(warning_checker) == 1
++    if py39:
++        assert len(warning_checker) == 2
++    else:
++        assert len(warning_checker) == 1
+     msg = str(warning_checker.list[0].message)
+     assert re.match(
+         "^old-style middleware "
+@@ -537,7 +548,10 @@ async def test_new_style_middleware_clas
+         txt = await resp.text()
+         assert "OK[new style middleware]" == txt
+ 
+-    assert len(warning_checker) == 0
++    if py39:
++        assert len(warning_checker) == 1
++    else:
++        assert len(warning_checker) == 0
+ 
+ 
+ async def test_new_style_middleware_method(loop, aiohttp_client) -> None:
+@@ -563,4 +577,7 @@ async def test_new_style_middleware_meth
+         txt = await resp.text()
+         assert "OK[new style middleware]" == txt
+ 
+-    assert len(warning_checker) == 0
++    if py39:
++        assert len(warning_checker) == 1
++    else:
++        assert len(warning_checker) == 0