diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1aa6452..913631c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,11 +14,11 @@ jobs:
     strategy:
       matrix:
         python:
-          - "3.7"
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
+          - "3.13"
     steps:
 
     - name: Checkout
@@ -38,12 +38,6 @@ jobs:
       run: |
         tox -e py${{ matrix.python }}
 
-    - name: Upload coverage results
-      uses: actions/upload-artifact@v2
-      with:
-        name: coverage-artifacts
-        path: .coverage.py${{ matrix.python }}
-
   run-unittests-w-deps:
     name: unit-w-deps
     runs-on: ubuntu-latest
@@ -55,7 +49,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Install tox
       run: |
@@ -67,7 +61,7 @@ jobs:
         tox -e w_deps
 
     - name: Upload coverage results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-artifacts
         path: .coverage.w_deps
@@ -75,9 +69,6 @@ jobs:
   report-coverage:
     name: cover
     runs-on: ubuntu-latest
-    needs:
-        - run-unittests
-        - run-unittests-w-deps
 
     steps:
 
@@ -87,20 +78,12 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: "3.10"
+        python-version: "3.12"
 
-    - name: Install coverage
-      run: |
-        python -m pip install --upgrade setuptools pip wheel
-        python -m pip install coverage
-
-    - name: Download coverage results
-      uses: actions/download-artifact@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
       with:
-        name: coverage-artifacts
-        path: .coverage-results/
+        python-version: "3.9"
 
-    - name: Report coverage results
-      run: |
-        coverage combine .coverage-results/.coverage*
-        coverage report --show-missing --fail-under=100
+    - run: pip install tox
+    - run: tox -e py312-cover,w_deps,cover
diff --git a/CHANGES.rst b/CHANGES.rst
index 873d1f3..27453f7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
 ``repoze.retry`` Changelog
 ==========================
 
+2.1 (unreleased)
+----------------
+
+- Add support for Python 3.12 and 3.13
+
+- Drop support for Python 3.7 and 3.8.
+
 2.0 (2023-01-23)
 ----------------
 
diff --git a/setup.py b/setup.py
index bfbea1c..9b67659 100644
--- a/setup.py
+++ b/setup.py
@@ -21,17 +21,21 @@ def _read_file(filename):
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "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",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware",
         ],
+      python_requires=">=3.9",
+      install_requires=[
+        'setuptools',
+      ],
       keywords='wsgi middleware retry',
       author="Agendaless Consulting",
       author_email="repoze-dev@lists.repoze.org",
diff --git a/tox.ini b/tox.ini
index 04c5012..37e8f9d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = 
-    py37,py38,py39,py310,py311,pypy3,w_deps,cover,docs
+    py39,py310,py311,py312,py313,pypy3,w_deps,cover,docs
 
 [testenv]
 usedevelop=true
@@ -14,7 +14,7 @@ setenv =
 
 [testenv:w_deps]
 basepython =
-    python3.8
+    python3.9
 deps =
     transaction
     ZODB
@@ -25,7 +25,7 @@ deps =
 [testenv:cover]
 skip_install = true
 basepython =
-    python3.10
+    python3.12
 commands = 
     coverage combine
     coverage report --fail-under=100 --show-missing
@@ -34,10 +34,11 @@ deps =
     coverage
 setenv =
     COVERAGE_FILE=.coverage
+depends = py39,py310,py311,py312,py313,pypy3,w_deps
 
 [testenv:docs]
 basepython =
-    python3.10
+    python3.12
 commands = 
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
 deps =