diff --git a/templates/ansible.yml.j2 b/templates/ansible.yml.j2
index 9513a54..f907570 100644
--- a/templates/ansible.yml.j2
+++ b/templates/ansible.yml.j2
@@ -100,7 +100,11 @@ jobs:
         with:
           image: {% raw %}${{ matrix.image }}{% endraw %}
 
-          options: parallel
+{% if tox_parallel is defined %}
+{% if tox_parallel %}
+          options: "--parallel all"
+{% endif %}
+{% endif %}
   release:
     needs:
       - test
diff --git a/templates/travis.yml.j2 b/templates/travis.yml.j2
index ac9a30b..5b07a4d 100644
--- a/templates/travis.yml.j2
+++ b/templates/travis.yml.j2
@@ -97,12 +97,12 @@ install:
   - pip install tox
 
 script:
-{% if travis_parallel is defined %}
-{% if not travis_parallel %}
-  - tox
+{% if tox_parallel is defined %}
+{% if tox_parallel %}
+  - tox --parallel all
 {% endif %}
 {% else %}
-  - tox --parallel all
+  - tox
 {% endif %}
 
 notifications: