diff --git a/.travis.yml b/.travis.yml
index 3501212..c24fb80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,40 @@
 language: python
-python: '3.5'
+python: '3.7'
+os: linux
 
 env:
-  matrix:
+  jobs:
 # sort by django version, next to by python version
 # Django 1.7 support Python 2.7, 3.4
-  - TOX_ENV=django17-py27
-  - TOX_ENV=django17-py34
+  - env: TOX_ENV=django17-py27
 # Django 1.8 support Python 2.7, 3.4, 3.5
-  - TOX_ENV=django18-py27
-  - TOX_ENV=django18-py34
-  - TOX_ENV=django18-py35
+  - env: TOX_ENV=django18-py27
+  - env: TOX_ENV=django18-py35
 # Django 1.9 support Python 2.7, 3.4, 3.5
-  - TOX_ENV=django19-py27
-  - TOX_ENV=django19-py34
-  - TOX_ENV=django19-py35
+  - env: TOX_ENV=django19-py27
+  - env: TOX_ENV=django19-py35
 # Django 1.10 support Python 2.7, 3.4, 3.5
-  - TOX_ENV=django110-py27
-  - TOX_ENV=django110-py34
-  - TOX_ENV=django110-py35
+  - env: TOX_ENV=django110-py27
+  - env: 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, 3.7
+  - env: TOX_ENV=django111-py34
+  - env: TOX_ENV=django111-py35
+  - env: TOX_ENV=django111-py36
+# Django 2.0 support Python 3.5, 3.6, 3.7
+  - env: TOX_ENV=django20-py35
+  - env: TOX_ENV=django20-py36
+  - env: TOX_ENV=django20-py37
+# Django 2.1 support Python 3.5, 3.6, 3.7
+  - env: TOX_ENV=django20-py35
+  - env: TOX_ENV=django20-py36
+  - env: TOX_ENV=django20-py37
+# Django 2.1 support Python 3.5, 3.6, 3.7
+  - env: TOX_ENV=django20-py35
+  - env: TOX_ENV=django20-py36
+  - env: TOX_ENV=django20-py37
 
+env:
   global:
   - secure: aswHU7pQroGM+GHoYlhXzzk2FYfqxXJORjqXPsbgoHAIu4Bssaj8+YAzIcdy3j9kSt4I8VBpjnn8H/wzQXki75JBZOosQrIeMK018+uR+ZMONBLqDYW/N7EJHLgZt9QXxQNKeZygrD4GN/Dc4gLHGvPQC/RfPuuHcnF0Liaahoo=
   - secure: RZ6M6984P885GRoyx9n/WCCWGoFAzYpS8sZkXu3e/HK9oPXfaM2IEHjkq03jIC/FcWn/QMtFjOUBqQU94rnqdivFdFkeZHk1WUQgC0hztH3Qhh9zu2PNIrYUDpVD5dJqBpprWbSwFP8yNsJlP9A2RUubTlZblKHuaBhhiuNN+kU=
@@ -35,8 +45,4 @@ install:
   - pip install tox
 
 script:
-  # Update Python 3.6 path - see bug https://github.com/travis-ci/travis-ci/issues/4990
-  - if [[ $TOX_ENV = *"py36"* ]]; then echo "Activated PY3.6"; source ~/virtualenv/python3.6/bin/activate; pip install tox; fi
-  - tox -e $TOX_ENV
-
-sudo: false
+  - tox -e $TOX_ENV
\ No newline at end of file
diff --git a/docs/topics/development.rst b/docs/topics/development.rst
index cdc7154..ccd567c 100644
--- a/docs/topics/development.rst
+++ b/docs/topics/development.rst
@@ -55,5 +55,3 @@ To add support for a new version perform the following task:
 * Ensure that ``.travis.yml`` file reflects support for new Django release. Note the excluded versions of the Python interpreter.
 * Verify by pushing changes on a separate branch to see if the changes in TravisCI are correct.
 * Proceed to the standard procedure for a new package release (see `How to do a new release?`_ ).
-
-A `spreadsheet with generator is available <https://docs.google.com/spreadsheets/d/1YsVPDeOAgf_c_7XOXh6SZUO2ebMNoFXysxfj4r1tFiM/edit?usp=sharing>`_ that can assist this process.
diff --git a/setup.py b/setup.py
index d6e4625..5197f46 100755
--- a/setup.py
+++ b/setup.py
@@ -38,13 +38,14 @@ setup(
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        '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..534048c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,27 +3,30 @@
 envlist=
     flake8
     py{27,34}-django17
-    py{34,35}-django18
-    py{27,34,35}-django19
-    py{27,34,35}-django110
-    py{27,34,35,36}-django111
-    py{34,35,36}-django20
+    py{27,35}-django18
+    py{27,35}-django19
+    py{27,35}-django110
+    py{27,35,36}-django111
+    py{35,36,37}-django20
+    py{35,36,37}-django21
 
 [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.1.*
     -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
     python manage.py test -v2 {posargs}
 
 [testenv:flake8]