diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0c8db2a..8e81ee8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,8 +14,6 @@ jobs:
         cms: [nocms, cms311, async]
         continue-on-error: [false]
         exclude:
-          - django: 50
-            cms: cms311
           - django: 50
             python-version: 3.9
           - django: 50
diff --git a/changes/252.feature b/changes/252.feature
new file mode 100644
index 0000000..41a41dc
--- /dev/null
+++ b/changes/252.feature
@@ -0,0 +1 @@
+Add DjangoCMS 3.11 to Django 5.0 test matrix
diff --git a/tox.ini b/tox.ini
index 000aa05..9100f81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,9 +8,9 @@ envlist =
     ruff
     pypi-description
     towncrier
-    py{3.12}-django{42,50}-{nocms,async}
-    py{3.11}-django{42,41,40,32}-{cms311,nocms,async}
-    py{3.10}-django{42,41,40,32}-{cms311,nocms,async}
+    py{3.12}-django{50,42}-{cms311,nocms,async}
+    py{3.11}-django{50,42,41,40,32}-{cms311,nocms,async}
+    py{3.10}-django{50,42,41,40,32}-{cms311,nocms,async}
     py{3.9}-django{32}-{cms311,nocms,async}
     py{3.8}-django{32}-{cms311,nocms,async}
 minversion = 3.23
@@ -22,8 +22,8 @@ deps=
     django40: django~=4.0.0
     django41: django~=4.1.0
     django42: django~=4.2.0
-    django50: django~=5.0.0b1
-    cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip
+    django50: django~=5.0.0
+    cms311: git+https://github.com/protoroto/django-cms.git@90b38bfaa0c4bb1d9476ec27d9698a3cef04c5f0
     cms311: djangocms-text-ckeditor>=5.0,<6.0
     -r{toxinidir}/requirements-test.txt
     async: channels[daphne]~=4.0.0