diff --git a/Makefile b/Makefile
index 8b190c671..55574a834 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# This file is managed by cookiecutter. Any changes should originate in the template and be applied through cookiecutter/apply_templates.py.
 
 LANGUAGES=de
 GLUE_PLUGINS=$(notdir $(wildcard pulp-glue/src/pulp_glue/*))
diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile b/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile
index 4c2612a9d..da3a91597 100644
--- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile	
+++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile	
@@ -1,4 +1,6 @@
 {%- set src_infix = "src/" if cookiecutter.src_layout else "" %}
+# This file is managed by cookiecutter. Any changes should originate in the template and be applied through cookiecutter/apply_templates.py.
+
 {%- if cookiecutter.translations %}
 LANGUAGES=de
 {%- endif %}
@@ -80,7 +82,7 @@ livetest:
 
 .PHONY: _paralleltest
 _paralleltest: | tests/cli.toml
-	pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live -n 8
+	pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m "$(PYTEST_MARK)" -n 8
 
 .PHONY: paralleltest
 paralleltest: