diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29a8a145..b38fd86b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Added
 - Added async support for helpers that are merged from opensearch-dsl-py ([#329](https://github.com/opensearch-project/opensearch-py/pull/329))
 ### Changed
+- Upgrading pytest-asyncio to latest version - 0.21.0 ([#339](https://github.com/opensearch-project/opensearch-py/pull/339))
 ### Deprecated
 ### Removed
 ### Fixed
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 4437321c..171bc2c2 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -20,5 +20,5 @@ twine
 
 # Requirements for testing [async] extra
 aiohttp; python_version>="3.6"
-pytest-asyncio<=0.18.3; python_version>="3.6"
+pytest-asyncio<=0.21.0; python_version>="3.6"
 unasync; python_version>="3.6"
diff --git a/setup.cfg b/setup.cfg
index c6aa0a7d..1437bc0e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,7 @@ ignore = E203, E266, E501, W503
 
 [tool:pytest]
 junit_family=legacy
+asyncio_mode=auto
 
 [tool:isort]
 profile=black