diff --git a/.travis.yml b/.travis.yml
index a46726d6c..0b7e38fc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,18 @@ language: python
 
 python: 3.6
 
-env:
-  - TOX_ENV=py36
-
 before_install:
   - docker-compose -v
   - docker -v
 
-script:
-  - tox -e $TOX_ENV
-  - sh tests/test_docker.sh
+matrix:
+  include:
+    - name: Tox test
+      script: tox -e py36
+    - name: Basic Docker
+      script: sh tests/test_docker.sh
+    - name: Docker with Celery
+      script: sh tests/test_docker.sh use_celery=y
 
 install:
   - pip install tox
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index eddfe98c6..b0631530d 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -11,7 +11,7 @@ mkdir -p .cache/docker
 cd .cache/docker
 
 # create the project using the default settings in cookiecutter.json
-cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y
+cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
 cd my_awesome_project
 
 # run the project's type checks