diff --git a/.travis.yml b/.travis.yml
index f0d2e05f2..477fd4e3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ 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.1 }
       - { python: "2.7", env: TOXENV=lint }
       - { python: "2.7", env: TOXENV=docs }
@@ -32,6 +33,13 @@ matrix:
           - tox --installpkg ./dist/djangorestframework-*.whl
           - tox  # test sdist
 
+      - python: "3.6"
+        env: TOXENV=dist-optionals
+        script:
+          - python setup.py bdist_wheel
+          - tox --installpkg ./dist/djangorestframework-*.whl
+          - tox  # test sdist
+
     exclude:
       - { python: "2.7", env: DJANGO=master }
       - { python: "2.7", env: DJANGO=2.0 }
diff --git a/tox.ini b/tox.ini
index 852de5e6e..a8fb25ec6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ envlist =
        {py35,py36}-django21
        {py35,py36}-djangomaster,
        dist,lint,docs,
+       py36-django20-optionals,
 
 [travis:env]
 DJANGO =
@@ -14,6 +15,8 @@ DJANGO =
     2.0: django20
     2.1: django21
     master: djangomaster
+OPTIONALS =
+    1: optionals
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
@@ -27,15 +30,15 @@ deps =
         django20: Django>=2.0,<2.1
         django21: Django>=2.1b1,<2.2
         djangomaster: https://github.com/django/django/archive/master.tar.gz
+        optionals: -rrequirements/requirements-optionals.txt
         -rrequirements/requirements-testing.txt
-        -rrequirements/requirements-optionals.txt
 
 [testenv:dist]
 commands = ./runtests.py --fast {posargs} --no-pkgroot --staticfiles -rw
 deps =
         django
+        optionals: -rrequirements/requirements-optionals.txt
         -rrequirements/requirements-testing.txt
-        -rrequirements/requirements-optionals.txt
 
 [testenv:lint]
 basepython = python2.7