diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8278a1e..79fb3d6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,7 +34,7 @@ jobs:
     container: aiudirog/aiohappybase-test-env:latest
     strategy:
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9']
+        python: ['3.9', '3.10', '3.11', '3.12']
         client: ['socket', 'http']
       fail-fast: false
     steps:
diff --git a/aiohappybase/pool.py b/aiohappybase/pool.py
index f4eb5af..3d80b18 100644
--- a/aiohappybase/pool.py
+++ b/aiohappybase/pool.py
@@ -14,15 +14,8 @@
 
 from .connection import Connection
 
-try:
-    from asyncio import current_task
-except ImportError:  # < 3.7
-    current_task = aio.Task.current_task
-
-try:
-    from contextlib import asynccontextmanager
-except ImportError:  # < 3.7
-    from async_generator import asynccontextmanager
+from asyncio import current_task
+from contextlib import asynccontextmanager
 
 logger = logging.getLogger(__name__)
 
diff --git a/requirements.txt b/requirements.txt
index 613805d..4249af8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
 thriftpy2>=0.4.11
-async_generator; python_version < '3.7'
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 39e3c0b..b714a5c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,10 +10,10 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Intended Audience :: Developers
     License :: OSI Approved :: MIT License
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Topic :: Database
     Topic :: Software Development :: Libraries :: Python Modules
 keywords =
@@ -63,7 +63,7 @@ filename = *happybase*/**.py
 exclude = build,dist,venv,.tox,*.egg*,coverage,doc
 
 [tox:tox]
-envlist = py36, py37, py38, py39
+envlist = py39, py310, py311, py312
 
 [testenv]
 deps = -rtest-requirements.txt