diff --git a/.travis.yml b/.travis.yml
index 83c52f4684640e4280f7a8d6e035f547f930ade3..40bfa33fc4b79dae5518d952b16ed9a9b47e32d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ python:
   - "3.5"
   - "2.7"
 env:
+  - DJANGO_VERSION=">=3.1.0,<3.2"
+  - DJANGO_VERSION=">=3.0.0,<3.1"
   - DJANGO_VERSION=">=2.2.0,<2.3"
   - DJANGO_VERSION=">=2.1.0,<2.2"
   - DJANGO_VERSION=">=2.0.0,<2.1"
@@ -27,6 +29,14 @@ jobs:
       env: DJANGO_VERSION=">=2.1.0,<2.2"
     - python: "2.7"
       env: DJANGO_VERSION=">=2.0.0,<2.1"
+    - python: "2.7"
+      env: DJANGO_VERSION=">=3.0.0,<3.1"
+    - python: "2.7"
+      env: DJANGO_VERSION=">=3.1.0,<3.2"
+    - python: "3.5"
+      env: DJANGO_VERSION=">=3.0.0,<3.1"
+    - python: "3.5"
+      env: DJANGO_VERSION=">=3.1.0,<3.2"
   include:
     - stage: lint
       install:
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 7eadc75e566aa7a77cbfbffbb0492e370e52d397..34b89cb7dd45f399b5ebc21dda84f6d84ec15a0e 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,2 +1,2 @@
 -r dev-env-requirements.txt
-django==2.2.13
+django==3.1.4
diff --git a/setup.py b/setup.py
index e569d63e5c7e7d1738d6a5960407efdb013e3b11..7c7a491bff614e14c67d27263e43f9fda9927e78 100755
--- a/setup.py
+++ b/setup.py
@@ -41,5 +41,7 @@ setup(
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
     ],
 )