diff --git a/.travis.yml b/.travis.yml
index 3501212..37e1466 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,22 @@ env:
   - TOX_ENV=django110-py34
   - TOX_ENV=django110-py35
 # Django 1.11 support all supported Python interpreter
-# Django 2.0 support Python 3.4, 3.5, 3.6
   - TOX_ENV=django111-py34
   - TOX_ENV=django111-py35
   - TOX_ENV=django111-py36
+# Django 2.0 support Python 3.4, 3.5, 3.6
+  - TOX_ENV=django20-py34
+  - TOX_ENV=django20-py35
+  - TOX_ENV=django20-py36
+# Django 2.1 support Python 3.4, 3.5, 3.6
+  - TOX_ENV=django21-py35
+  - TOX_ENV=django21-py36
+  - TOX_ENV=django21-py37
+# Django 2.2 support Python 3.5, 3.6
+  - TOX_ENV=django21-py35
+  - TOX_ENV=django21-py36
+  - TOX_ENV=django21-py37
+
 
   global:
   - secure: aswHU7pQroGM+GHoYlhXzzk2FYfqxXJORjqXPsbgoHAIu4Bssaj8+YAzIcdy3j9kSt4I8VBpjnn8H/wzQXki75JBZOosQrIeMK018+uR+ZMONBLqDYW/N7EJHLgZt9QXxQNKeZygrD4GN/Dc4gLHGvPQC/RfPuuHcnF0Liaahoo=
diff --git a/setup.py b/setup.py
index d6e4625..c15f4d4 100755
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,9 @@ setup(
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
@@ -45,6 +48,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Communications :: Email',
         'Topic :: Communications :: Email :: Post-Office',
         'Topic :: Communications :: Email :: Post-Office :: IMAP',
diff --git a/tox.ini b/tox.ini
index c7d6a2b..b35d7b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,22 +8,29 @@ envlist=
     py{27,34,35}-django110
     py{27,34,35,36}-django111
     py{34,35,36}-django20
+    py{35,36,37}-django21
+    py{35,36,37}-django22
 
 [testenv]
 passenv=EMAIL_IMAP_SERVER EMAIL_ACCOUNT EMAIL_PASSWORD EMAIL_SMTP_SERVER
 deps=
-    django17: django>=1.7,<1.8
-    django18: django>=1.8,<1.9
-    django19: django>=1.9,<1.10
-    django110: django>=1.10,<1.11
-    django111: django>=1.11,<2.0
-    django20: django>=2.0,<2.1
+    django17: django==1.7.*
+    django18: django==1.8.*
+    django19: django==1.9.*
+    django110: django==1.10.*
+    django111: django==1.11.*
+    django20: django==2.0.*
+    django21: django==2.0.*
+    django22: django==2.0.*
+    
     -r{toxinidir}/test_requirements.txt
 sitepackages=False
 commands=
     django110: python {toxinidir}/manage.py makemigrations --check --dry-run
     django111: python {toxinidir}/manage.py makemigrations --check --dry-run
     django20: python {toxinidir}/manage.py makemigrations --check --dry-run
+    django21: python {toxinidir}/manage.py makemigrations --check --dry-run
+    django22: python {toxinidir}/manage.py makemigrations --check --dry-run
     python manage.py test -v2 {posargs}
 
 [testenv:flake8]