diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 35998d65f..257b6a42b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix: # https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django
         django-version: ["3.2", "4.2", "5.0"]
-        python-version: ["3.8", "3.9", "3.10", "3.11"] # , "3.12" # Whoosh issues with Py3.10+
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         elastic-version: ["7.17.9"]
         exclude:
           - django-version: "3.2"
diff --git a/tox.ini b/tox.ini
index 498bb7f00..d5a436091 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,6 +28,7 @@ deps =
     geopy==2.0.0
     coverage
     requests
+    setuptools; python_version >= "3.12"  # Can be removed on pysolr >= v3.10
     django3.2: Django>=3.2,<3.3
     django4.2: Django>=4.2,<4.3
     django5.0: Django>=5.0,<5.1