diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b35c32e..f58aef3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.12'
+          python-version: '3.13'
       - name: Install tox
         run: |
           python -m pip install --upgrade pip
@@ -42,12 +42,15 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - 3.7
-          - 3.8
-          - 3.9
+          - '3.7'
+          - '3.8'
+          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
+          - '3.13'
+          - 'pypy3.9'
+          - 'pypy3.10'
     name: Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -61,4 +64,4 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install --upgrade 'tox>=4.0'
       - name: Run tests
-        run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d .)
+        run: tox run -f py$(echo ${{ matrix.python-version }} | sed "s/^py//" | tr -d .)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 679d95d..9a3aa9a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,9 +1,9 @@
 default_language_version:
-  python: python3.12
+  python: python3.13
 minimum_pre_commit_version: 2.4.0
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
       - id: check-json
@@ -20,13 +20,13 @@ repos:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.10.0
     hooks:
       - id: black
 
   # Flake8 includes pyflakes, pycodestyle, mccabe, pydocstyle, bandit
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         additional_dependencies: ["flake8-bandit"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbf7e1f..f6be25c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ The format of this changelog is based on [Keep a Changelog](http://keepachangelo
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Test on Django 5.0 and 5.1.
+- Test on Python 3.12 and 3.13 (for Django versions with support).
+- Testing with Pypy 3.10 on Django < 4.1 (see note about Pypy in 'Removed' section).
+
+### Removed
+- Stop building a universal wheel.
+- Remove testing with Pypy for Django >= 4.1. There is a Pypy bug preventing Django from working:
+  https://code.djangoproject.com/ticket/33889
 
 ## [2.0.0]
 ### Changed
diff --git a/setup.py b/setup.py
index c5c0007..56603a0 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,7 @@ def get_version():
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Utilities",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 7175766..ee8d042 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
 envlist =
-    {py36,py37,py38,py39,py310,pypy39}-django-3.2
-    {py38,py39,py310,pypy39}-django-4.0
-    {py38,py39,py310,py311,pypy39}-django-4.1
-    {py38,py39,py310,py311,pypy39}-django-4.2
+    {py36,py37,py38,py39,py310,pypy39,pypy310}-django-3.2
+    {py38,py39,py310,pypy39,pypy310}-django-4.0
+    {py38,py39,py310,py311}-django-4.1
+    {py38,py39,py310,py311}-django-4.2
     {py310,py311,py312}-django-5.0
-    {py310,py311,py312}-django-main
+    {py310,py311,py312,py313}-django-5.1
+    {py310,py311,py312,py313}-django-main
 skip_missing_interpreters = true
 
 [testenv]
@@ -17,13 +18,16 @@ basepython =
     py310: python3.10
     py311: python3.11
     py312: python3.12
+    py313: python3.13
     pypy39: pypy3.9
+    pypy310: pypy3.10
 deps=
     django-3.2: Django>=3.2,<3.3
     django-4.0: Django>=4.0,<4.1
     django-4.1: Django>=4.1,<4.2
     django-4.2: Django>=4.2,<4.3
     django-5.0: Django>=5.0,<5.1
+    django-5.1: Django>=5.1,<5.2
     django-main: https://github.com/django/django/archive/main.tar.gz
     backports.zoneinfo;python_version<"3.9"
     coverage
@@ -37,6 +41,6 @@ commands =
 [testenv:pre-commit]
 deps =
     pre-commit
-basepython = python3.12
+basepython = python3.13
 commands =
     pre-commit run --all-files --show-diff-on-failure