diff --git a/requirements-testing.txt b/requirements-testing.txt
index 7365a8d3f0..5dd48180ef 100644
--- a/requirements-testing.txt
+++ b/requirements-testing.txt
@@ -1,9 +1,9 @@
 pytest>=6.0.0
 pytest-cov
+dataclasses; python_version < "3.7"
 pytest-forked
 executing
 asttokens
 responses
-httpcore[http2]
 setuptools
 docker
diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
index 1b24bb69e8..28ef95891b 100644
--- a/scripts/populate_tox/config.py
+++ b/scripts/populate_tox/config.py
@@ -108,8 +108,8 @@
                 "djangorestframework",
                 "pytest-django",
                 "Werkzeug",
+                "channels[daphne]",
             ],
-            ">=2.0": ["channels[daphne]"],
             ">=2.2,<3.1": ["six"],
             ">=3.0": ["pytest-asyncio"],
             "<3.3": [
@@ -433,7 +433,7 @@
         "deps": {
             "*": ["websockets<11.0", "aiohttp"],
             ">=22": ["sanic-testing"],
-            "py3.6": ["aiocontextvars==0.2.1", "dataclasses"],
+            "py3.6": ["aiocontextvars==0.2.1"],
             "py3.8": ["tracerite<1.1.2"],
         },
         "num_versions": 4,
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
index 58574e253a..df84315cf4 100644
--- a/scripts/populate_tox/tox.jinja
+++ b/scripts/populate_tox/tox.jinja
@@ -80,12 +80,12 @@ deps =
     # === Common ===
     py3.8-common: hypothesis
     common: brotli
+    common: httpcore[asyncio,http2]
     common: jsonschema
     common: pysocks
     common: pytest-asyncio
     common: pytest-timeout
     common: pytest_localserver
-    common: httpcore[asyncio]
     common: socksio
     common: werkzeug
     # See https://github.com/pytest-dev/pytest/issues/9621
@@ -105,6 +105,7 @@ deps =
     {py3.6,py3.7}-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
     gevent: brotli
+    gevent: httpcore[http2]
     gevent: jsonschema
     gevent: pysocks
     gevent: pytest-asyncio
diff --git a/tox.ini b/tox.ini
index 9c9ef1508f..1e9e20d353 100644
--- a/tox.ini
+++ b/tox.ini
@@ -401,12 +401,12 @@ deps =
     # === Common ===
     py3.8-common: hypothesis
     common: brotli
+    common: httpcore[asyncio,http2]
     common: jsonschema
     common: pysocks
     common: pytest-asyncio
     common: pytest-timeout
     common: pytest_localserver
-    common: httpcore[asyncio]
     common: socksio
     common: werkzeug
     # See https://github.com/pytest-dev/pytest/issues/9621
@@ -426,6 +426,7 @@ deps =
     {py3.6,py3.7}-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
     gevent: brotli
+    gevent: httpcore[http2]
     gevent: jsonschema
     gevent: pysocks
     gevent: pytest-asyncio
@@ -11289,7 +11290,6 @@ deps =
 
     django-latest: django==6.0.6
 
-    django-latest: channels[daphne]
     django-latest: pytest-asyncio
 
     py3.12-django-latest: asgiref==3.11.1
@@ -11308,12 +11308,7 @@ deps =
     django: djangorestframework
     django: pytest-django
     django: Werkzeug
-    django-v2.2.28: channels[daphne]
-    django-v3.2.25: channels[daphne]
-    django-v4.2.30: channels[daphne]
-    django-v5.2.15: channels[daphne]
-    django-v6.0.6: channels[daphne]
-    django-v6.1a1: channels[daphne]
+    django: channels[daphne]
     django-v2.2.28: six
     django-v3.2.25: pytest-asyncio
     django-v4.2.30: pytest-asyncio
@@ -11329,7 +11324,6 @@ deps =
     django-v1.11.29: pytest-django<4.0
     django-v2.2.28: pytest-django<4.0
     {py3.14,py3.14t}-django: coverage==7.11.0
-    django-latest: channels[daphne]
     django-latest: pytest-asyncio
 
     flask-v1.1.4: flask==1.1.4
@@ -12720,7 +12714,6 @@ deps =
     sanic-v23.12.2: sanic-testing
     sanic-v25.12.1: sanic-testing
     {py3.6}-sanic: aiocontextvars==0.2.1
-    {py3.6}-sanic: dataclasses
     {py3.8}-sanic: tracerite<1.1.2
     sanic-latest: sanic-testing