diff --git a/.travis.yml b/.travis.yml
index 99ec29b..43d3210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -150,36 +150,6 @@ env:
   - TOXENV=py3.5-django1.11-mysql-pylibmc
   - TOXENV=py3.5-django1.11-mysql-locmem
   - TOXENV=py3.5-django1.11-mysql-filebased
-  - TOXENV=py3.6-django1.8-sqlite3-redis
-  - TOXENV=py3.6-django1.8-sqlite3-memcached
-  - TOXENV=py3.6-django1.8-sqlite3-pylibmc
-  - TOXENV=py3.6-django1.8-sqlite3-locmem
-  - TOXENV=py3.6-django1.8-sqlite3-filebased
-  - TOXENV=py3.6-django1.8-postgresql-redis
-  - TOXENV=py3.6-django1.8-postgresql-memcached
-  - TOXENV=py3.6-django1.8-postgresql-pylibmc
-  - TOXENV=py3.6-django1.8-postgresql-locmem
-  - TOXENV=py3.6-django1.8-postgresql-filebased
-  - TOXENV=py3.6-django1.8-mysql-redis
-  - TOXENV=py3.6-django1.8-mysql-memcached
-  - TOXENV=py3.6-django1.8-mysql-pylibmc
-  - TOXENV=py3.6-django1.8-mysql-locmem
-  - TOXENV=py3.6-django1.8-mysql-filebased
-  - TOXENV=py3.6-django1.10-sqlite3-redis
-  - TOXENV=py3.6-django1.10-sqlite3-memcached
-  - TOXENV=py3.6-django1.10-sqlite3-pylibmc
-  - TOXENV=py3.6-django1.10-sqlite3-locmem
-  - TOXENV=py3.6-django1.10-sqlite3-filebased
-  - TOXENV=py3.6-django1.10-postgresql-redis
-  - TOXENV=py3.6-django1.10-postgresql-memcached
-  - TOXENV=py3.6-django1.10-postgresql-pylibmc
-  - TOXENV=py3.6-django1.10-postgresql-locmem
-  - TOXENV=py3.6-django1.10-postgresql-filebased
-  - TOXENV=py3.6-django1.10-mysql-redis
-  - TOXENV=py3.6-django1.10-mysql-memcached
-  - TOXENV=py3.6-django1.10-mysql-pylibmc
-  - TOXENV=py3.6-django1.10-mysql-locmem
-  - TOXENV=py3.6-django1.10-mysql-filebased
   - TOXENV=py3.6-django1.11-sqlite3-redis
   - TOXENV=py3.6-django1.11-sqlite3-memcached
   - TOXENV=py3.6-django1.11-sqlite3-pylibmc
diff --git a/tox.ini b/tox.ini
index f6baa27..e39c1d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
-    py{2.7,3.4,3.5,3.6}-django{1.8,1.10,1.11}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
+    py{2.7,3.4,3.5}-django{1.8,1.10,1.11}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
+    py3.6-django1.11-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
 
 [testenv]
 basepython =