diff --git a/.travis.yml b/.travis.yml
index 477fd4e3f..16bdf2265 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,8 @@ matrix:
       - { python: "3.6", env: DJANGO=master }
       - { python: "3.6", env: DJANGO=1.11 }
       - { python: "3.6", env: DJANGO=2.0 }
-      - { python: "3.6", env: DJANGO=2.0 OPTIONALS=1 }
+      - { python: "3.6", env: DJANGO=2.0 }
+      - { python: "3.6", env: TOXENV=py36-django20-optionals }
       - { python: "3.6", env: DJANGO=2.1 }
       - { python: "2.7", env: TOXENV=lint }
       - { python: "2.7", env: TOXENV=docs }
diff --git a/tox.ini b/tox.ini
index a8fb25ec6..5749fd6c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,6 @@ envlist =
        {py35,py36}-django21
        {py35,py36}-djangomaster,
        dist,lint,docs,
-       py36-django20-optionals,
 
 [travis:env]
 DJANGO =
@@ -15,8 +14,6 @@ DJANGO =
     2.0: django20
     2.1: django21
     master: djangomaster
-OPTIONALS =
-    1: optionals
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
@@ -37,9 +34,13 @@ deps =
 commands = ./runtests.py --fast {posargs} --no-pkgroot --staticfiles -rw
 deps =
         django
-        optionals: -rrequirements/requirements-optionals.txt
         -rrequirements/requirements-testing.txt
 
+[testenv:dist-optionals]
+commands = {[testenv:dist]commands}
+deps = {[testenv:dist]deps}
+        -rrequirements/requirements-optionals.txt
+
 [testenv:lint]
 basepython = python2.7
 commands = ./runtests.py --lintonly