diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 85be813..f4daccc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
     - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ce6a19..064633f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 5.0.4
+- Add support for Django 6.0 and Python 3.13, 3.14
+
 ## 5.0.3
 - Fix for Potential n+1 query detected on AuthToken.user
 
diff --git a/setup.py b/setup.py
index bf7ada6..0d11631 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,8 @@
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
     ],
 
     # What does your project relate to?
diff --git a/tox.ini b/tox.ini
index 5b17cb8..fcbdbef 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,8 @@
 envlist =
     py{38,39,310,311,312}-django42,
     py{310,311,312}-django50,
+    py{310,311,312,313}-django52,
+    py{312,313,314}-django60,
 
 [testenv]
 commands =
@@ -14,6 +16,8 @@ setenv =
 deps =
     django42: Django>=4.2,<4.3
     django50: Django>=5.0,<5.1
+    django52: Django>=5.2,<5.3
+    django60: Django>=6.0,<6.1
     markdown>=3.0
     djangorestframework
     freezegun
@@ -31,3 +35,5 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
+    3.14: py314