diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2e8dd904..14034750 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,15 +9,22 @@ jobs:
     strategy:
       matrix:
         python-version: [3.8, 3.7, 3.6, 3.5]
-        django: [30, 22]
-        cms: [37]
+        django: [31, 30, 22]
+        cms: [38, 37]
         exclude:
           - python-version: 3.5
             django: 30
+          - python-version: 3.5
+            django: 31
+          - django: 31
+            cms: 37
         include:
           - python-version: 3.8
             django: 22
             cms: no-search-37
+          - python-version: 3.8
+            django: 31
+            cms: no-search-38
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/README.rst b/README.rst
index 11c72be6..15b21fd0 100644
--- a/README.rst
+++ b/README.rst
@@ -8,11 +8,11 @@ django CMS blog application - Support for multilingual posts, placeholders, soci
 
 Supported Django versions:
 
-* Django 2.2, 3.0
+* Django 2.2, 3.0, 3.1
 
 Supported django CMS versions:
 
-* django CMS 3.7+
+* django CMS 3.7, 3.8+
 
 .. warning:: For Django<2.2, django CMS<3.7 versions support, use djangocms-blog 1.1x.
 
diff --git a/changes/643.feature b/changes/643.feature
new file mode 100644
index 00000000..f833ecb1
--- /dev/null
+++ b/changes/643.feature
@@ -0,0 +1 @@
+Add support for django CMS 3.8 / Django 3.1
diff --git a/setup.cfg b/setup.cfg
index ec0b6190..a84158e2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,6 +40,7 @@ classifiers =
     Framework :: Django
     Framework :: Django :: 2.2
     Framework :: Django :: 3.0
+    Framework :: Django :: 3.1
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
diff --git a/tox.ini b/tox.ini
index 99876b59..39cab515 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,9 @@ envlist =
     pep8
     pypi-description
     towncrier
-    py{38,37,36}-django{30}-cms{37,no-search-37}
-    py{38,37,36,35}-django{22}-cms{37,no-search-37}
+    py{38,37,36}-django{31}-cms{38,no-search-38}
+    py{38,37,36}-django{30}-cms{38,37,no-search-37}
+    py{38,37,36,35}-django{22}-cms{38,37,no-search-37}
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py djangocms_blog test {posargs}
@@ -24,9 +25,17 @@ deps =
     django30: django-filer>=1.6
     django30: django-appdata>=0.3.0
     django30: django-haystack==3.0b2
+    django31: Django>=3.1,<3.2
+    django31: django-mptt>=0.9
+    django31: django-filer>=2.0
+    django31: django-appdata>=0.3.2
+    django31: django-haystack==3.0b2
     cms37: https://github.com/divio/django-cms/archive/release/3.7.x.zip
     cms37: aldryn-search
     cms-no-search-37: https://github.com/divio/django-cms/archive/release/3.7.x.zip
+    cms38: https://github.com/divio/django-cms/archive/release/3.8.x.zip
+    cms38: aldryn-search
+    cms-no-search-38: https://github.com/divio/django-cms/archive/release/3.8.x.zip
     channels>2,<3
     https://github.com/nephila/django-knocker/archive/master.zip
     channels-redis