diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b8e9ee8b..db76fce8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,24 +11,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
-        django-version: ['4.2', '5.0', '5.1', '5.2', 'main']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        django-version: ['4.2', '5.0', '5.1', '5.2', '6.0', 'main']
 
         exclude:
           # Exclude py3.9 for Django >= 5.0,
           # and py3.10 and py3.11 for Django > 5.2
+          # and py3.14 for Django < 5.2
           - python-version: '3.9'
             django-version: '5.0'
           - python-version: '3.9'
             django-version: '5.1'
           - python-version: '3.9'
             django-version: '5.2'
+          - python-version: '3.9'
+            django-version: '6.0'
           - python-version: '3.9'
             django-version: 'main'
+          - python-version: '3.10'
+            django-version: '6.0'
           - python-version: '3.10'
             django-version: 'main'
+          - python-version: '3.11'
+            django-version: '6.0'
           - python-version: '3.11'
             django-version: 'main'
+          - python-version: '3.14'
+            django-version: '4.2'
+          - python-version: '3.14'
+            django-version: '5.0'
+          - python-version: '3.14'
+            django-version: '5.1'
 
     services:
 
@@ -73,6 +86,7 @@ jobs:
             pyproject.toml
             tox.ini
             requirements/*.txt
+          allow-prereleases: true
 
       - name: Install dependencies
         run: |
@@ -107,7 +121,7 @@ jobs:
       - name: Set up newest stable Python version
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.x
           cache: 'pip'
           # Invalidate the cache when this file updates, as the dependencies' versions
           # are pinned in the step below
@@ -117,9 +131,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           # Install this project in editable mode, so that its package metadata can be queried
-          pip install -e .
+          pip install --editable .
           # Install the latest minor version of Django we support
-          pip install Django==5.1
+          pip install --pre "Django>=6.0a1"
 
       - name: Check translation files are updated
         run: python -m simple_history.tests.generated_file_checks.check_translations
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 16602a25..05a3b8fc 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -27,6 +27,7 @@ Authors
 - Brian Mesick (`bmedx <https://github.com/bmedx>`_)
 - Buddy Lindsey, Jr.
 - Carlos San Emeterio (`Carlos-San-Emeterio <https://github.com/Carlos-San-Emeterio>`_)
+- Christian Clauss (`cclauss <https://github.com/cclauss>`_)
 - Christopher Broderick (`uhurusurfa <https://github.com/uhurusurfa>`_)
 - Christopher Johns (`tyrantwave <https://github.com/tyrantwave>`_)
 - Conrad (`creyD <https://github.com/creyD>`_)
diff --git a/CHANGES.rst b/CHANGES.rst
index 59e00f55..34a86b8c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changes
 Unreleased
 ----------
 
+- Added support for Python 3.14
+- Added support for Django 6.0
+
 3.10.1 (2025-06-20)
 -------------------
 
diff --git a/README.rst b/README.rst
index cd3b8383..967bec83 100644
--- a/README.rst
+++ b/README.rst
@@ -44,8 +44,9 @@ This app supports the following combinations of Django and Python:
 4.2         3.9, 3.10, 3.11, 3.12, 3.13
 5.0         3.10, 3.11, 3.12, 3.13
 5.1         3.10, 3.11, 3.12, 3.13
-5.2         3.10, 3.11, 3.12, 3.13
-main        3.12, 3.13
+5.2         3.10, 3.11, 3.12, 3.13, 3.14
+6.0         3.12, 3.13, 3.14
+main        3.12, 3.13, 3.14
 ==========  ========================
 
 Getting Help
diff --git a/docs/index.rst b/docs/index.rst
index fcd8420f..2bcc6c3c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -40,8 +40,9 @@ This app supports the following combinations of Django and Python:
 4.2         3.9, 3.10, 3.11, 3.12, 3.13
 5.0         3.10, 3.11, 3.12, 3.13
 5.1         3.10, 3.11, 3.12, 3.13
-5.2         3.10, 3.11, 3.12, 3.13
-main        3.12, 3.13
+5.2         3.10, 3.11, 3.12, 3.13, 3.14
+6.0         3.12, 3.13, 3.14
+main        3.12, 3.13, 3.14
 ==========  =======================
 
 Contribute
diff --git a/tox.ini b/tox.ini
index eee24979..b6243990 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,8 @@
 envlist =
     py3{9-13}-dj42-{sqlite3,postgres,mysql,mariadb},
     py3{10-13}-dj{50-52}-{sqlite3,postgres,mysql,mariadb},
-    py3{12-13}-dj{main}-{sqlite3,postgres,mysql,mariadb},
+    py3{12-13}-dj{60,main}-{sqlite3,postgres,mysql,mariadb},
+    py314-dj{52,60,main}-{sqlite3,postgres,mysql,mariadb},
     docs,
     lint
 
@@ -13,6 +14,7 @@ python =
     3.11: py311, docs, lint
     3.12: py312
     3.13: py313
+    3.14: py314
 
 [gh-actions:env]
 DJANGO =
@@ -20,6 +22,7 @@ DJANGO =
     5.0: dj50
     5.1: dj51
     5.2: dj52
+    6.0: dj60
     main: djmain
 
 [flake8]
@@ -34,7 +37,8 @@ deps =
     dj42: Django>=4.2,<4.3
     dj50: Django>=5.0,<5.1
     dj51: Django>=5.1,<5.2
-    dj52: Django>=5.2a1,<5.3  # Use a1 to allow testing of the release candidates
+    dj52: Django>=5.2,<5.3
+    dj60: Django>=6.0a1,<6.1  # Use a1 to allow testing of the release candidates
     djmain: https://github.com/django/django/tarball/main
     postgres: -rrequirements/postgres.txt
     mysql: -rrequirements/mysql.txt