diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/conftest.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/conftest.mustache
index c0fd51198d74..b5f3bcf90306 100644
--- a/modules/openapi-generator/src/main/resources/python-aiohttp/conftest.mustache
+++ b/modules/openapi-generator/src/main/resources/python-aiohttp/conftest.mustache
@@ -6,7 +6,7 @@ import connexion
 
 
 @pytest.fixture
-def client(loop, aiohttp_client):
+async def client(aiohttp_client):
     logging.getLogger('connexion.operation').setLevel('ERROR')
     options = {
         "swagger_ui": True
@@ -23,4 +23,4 @@ def client(loop, aiohttp_client):
                                options=options)
     app.add_api('openapi.yaml', pythonic_params=True,
                 pass_context_arg_name='request')
-    return loop.run_until_complete(aiohttp_client(app.app))
+    return await aiohttp_client(app.app)
diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/test-requirements.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/test-requirements.mustache
index a408e178b362..cd0db803a758 100644
--- a/modules/openapi-generator/src/main/resources/python-aiohttp/test-requirements.mustache
+++ b/modules/openapi-generator/src/main/resources/python-aiohttp/test-requirements.mustache
@@ -9,5 +9,6 @@ randomize>=0.13
 pytest~=7.1.0
 pytest-cov>=2.8.1
 pytest-randomly>=1.2.3
-pytest-aiohttp>=0.3.0
+pytest-aiohttp>=1.0.0
+pytest-asyncio>=0.17.2
 {{/useNose}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/tox.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/tox.mustache
index 7a330dfac98d..6f0e6966f25d 100644
--- a/modules/openapi-generator/src/main/resources/python-aiohttp/tox.mustache
+++ b/modules/openapi-generator/src/main/resources/python-aiohttp/tox.mustache
@@ -9,3 +9,8 @@ deps=-r{toxinidir}/requirements.txt
 
 commands=
    {{^useNose}}pytest --cov={{{packageName}}}{{/useNose}}{{#useNose}}nosetests{{/useNose}}
+{{^useNose}}
+
+[pytest]
+asyncio_mode = auto
+{{/useNose}}
diff --git a/samples/server/petstore/python-aiohttp-srclayout/test-requirements.txt b/samples/server/petstore/python-aiohttp-srclayout/test-requirements.txt
index bb7df90d4b2c..8086feb7a5a3 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/test-requirements.txt
+++ b/samples/server/petstore/python-aiohttp-srclayout/test-requirements.txt
@@ -1,4 +1,5 @@
 pytest~=7.1.0
 pytest-cov>=2.8.1
 pytest-randomly>=1.2.3
-pytest-aiohttp>=0.3.0
+pytest-aiohttp>=1.0.0
+pytest-asyncio>=0.17.2
diff --git a/samples/server/petstore/python-aiohttp-srclayout/tests/conftest.py b/samples/server/petstore/python-aiohttp-srclayout/tests/conftest.py
index 578bf18e982c..2616155e5100 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/tests/conftest.py
+++ b/samples/server/petstore/python-aiohttp-srclayout/tests/conftest.py
@@ -6,7 +6,7 @@
 
 
 @pytest.fixture
-def client(loop, aiohttp_client):
+async def client(aiohttp_client):
     logging.getLogger('connexion.operation').setLevel('ERROR')
     options = {
         "swagger_ui": True
@@ -19,4 +19,4 @@ def client(loop, aiohttp_client):
                                options=options)
     app.add_api('openapi.yaml', pythonic_params=True,
                 pass_context_arg_name='request')
-    return loop.run_until_complete(aiohttp_client(app.app))
+    return await aiohttp_client(app.app)
diff --git a/samples/server/petstore/python-aiohttp-srclayout/tox.ini b/samples/server/petstore/python-aiohttp-srclayout/tox.ini
index 7663dfb69e41..ff88a0eaa3c0 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/tox.ini
+++ b/samples/server/petstore/python-aiohttp-srclayout/tox.ini
@@ -9,3 +9,6 @@ deps=-r{toxinidir}/requirements.txt
 
 commands=
    pytest --cov=openapi_server
+
+[pytest]
+asyncio_mode = auto