diff --git a/requirements.txt b/requirements.txt
index 31db2276..c7e58e96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-Django==2.0.4
-djangorestframework==3.8.2
+Django==2.1.3
+djangorestframework==3.9.0
 coreapi==2.3.3
 openapi-codec==1.3.2
 simplejson==3.9.0
@@ -17,4 +17,4 @@ mkdocs==0.15.3
 dj_database_url==0.5.0
 psycopg2==2.7.4
 gunicorn==19.8.0
-whitenoise==3.3.1
\ No newline at end of file
+whitenoise==3.3.1
diff --git a/setup.py b/setup.py
index 4a452917..70bbaf4b 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index e7dac3a7..82769430 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     {py27,py36}-django{18,19,110,111}-drf{35,36}
     {py27,py36}-django{110,111}-drf{37,38}
     {py36}-django{2}-drf{37,38}
+    {py36}-django{21}-drf{39}
     lint
 
 [testenv]
@@ -19,11 +20,13 @@ deps =
     drf36: djangorestframework>=3.6.0,<3.7
     drf37: djangorestframework>=3.7.0,<3.8
     drf38: djangorestframework>=3.8.0,<3.9
+    drf39: djangorestframework>=3.9.0,<3.10
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
     django2: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
 
 [testenv:latest]
 commands = coverage run runtests.py