diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f1ee29a..2fc80647 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        django: ["django==4.2.26", "django==5.1.14", "django==5.2.8"]
+        django:
+          ["django==4.2.26", "django==5.1.14", "django==5.2.8", "django==6.0b1"]
 
     services:
       postgres:
diff --git a/docs/index.md b/docs/index.md
index 30b86fca..68e5513b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,9 +15,10 @@ Features:
 
 The project is hosted on [github](https://github.com/mbraak/django-file-form).
 
-Works with Django 4.2, 5.0 and 5.1 Also with Python 3.8 - 3.13
+Works with Django 4.2, 5.1, 5.2 and 6.0 Also with Python 3.10 - 3.13
 
 Older versions:
 
 - Django-file-form 3.6.x supports Django 3.2
 - Django-file-form 3.5.x supports Django 4.1
+- Django-file-form 3.9.x supports Django 5.0
diff --git a/setup.py b/setup.py
index c5456f7e..90332955 100644
--- a/setup.py
+++ b/setup.py
@@ -28,12 +28,14 @@
         "Framework :: Django :: 4.2",
         "Framework :: Django :: 5.1",
         "Framework :: Django :: 5.2",
+        "Framework :: Django :: 6.0",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "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",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
 )
diff --git a/testproject/requirements_django.txt b/testproject/requirements_django.txt
index 7db3eb15..3e6ee6dc 100644
--- a/testproject/requirements_django.txt
+++ b/testproject/requirements_django.txt
@@ -1 +1 @@
-Django>=5.2,<5.3
+Django==6.0b1
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 050da676..9186265e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py310-django42,py312-django42,py310-django51,py313-django51,py313-django52
+envlist = py310-django42,py312-django42,py310-django51,py313-django51,py313-django52,py314-django6
 
 [testenv]
 changedir = {toxinidir}/testproject
@@ -11,9 +11,11 @@ deps =
     django42: Django>=4.2,<4.3
     django51: Django>=5.1,<5.2
     django52: Django>=5.2,<5.3
+    django6: Django==6.0b1
 commands =
     python -Wd manage.py test django_file_form_example
 basepython =
     py310: python3.10
     py312: python3.12
     py313: python3.13
+    py314: python3.14
\ No newline at end of file