diff --git a/{{cookiecutter.repo_name}}/ci/templates/tox.ini b/{{cookiecutter.repo_name}}/ci/templates/tox.ini
index 58fb09fb..059a2e37 100644
--- a/{{cookiecutter.repo_name}}/ci/templates/tox.ini
+++ b/{{cookiecutter.repo_name}}/ci/templates/tox.ini
@@ -1,12 +1,11 @@
-{% raw -%}
 [tox]
 envlist =
     clean,
-    check,
-{% for env in tox_environments|sort %}
+    {% if cookiecutter.test_runner|lower == "pytest" %}check,{% endif %}
+{% raw %}{% for env in tox_environments|sort %}
     {{ env }},
-{% endfor %}
-    report,
+{% endfor %}{% endraw %}
+    {% if cookiecutter.test_runner|lower == "pytest" %}report,{% endif %}
     docs
 
 [testenv]
@@ -19,7 +18,6 @@ setenv =
 passenv =
     *
 deps =
-{%- endraw -%}
 {%- if cookiecutter.test_runner|lower == "pytest" %}
     pytest
     pytest-travis-fold
diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini
index 199c1800..fa918299 100644
--- a/{{cookiecutter.repo_name}}/tox.ini
+++ b/{{cookiecutter.repo_name}}/tox.ini
@@ -20,10 +20,10 @@ passenv =
 
 [tox]
 envlist =
-    clean,
+    {% if cookiecutter.test_runner|lower == "pytest" %}clean,{% endif %}
     check,
     {py27,py33,py34,py35,pypy}{% if cookiecutter.test_matrix_separate_coverage == 'yes' %}-{cover,nocov}{% endif %},
-    report,
+    {% if cookiecutter.test_runner|lower == "pytest" %}report,{% endif %}
     docs
 
 [testenv]