diff --git a/Makefile.local b/Makefile.local
--- a/Makefile.local
+++ b/Makefile.local
@@ -55,7 +55,9 @@
 	echo "flush_all" | nc -q 2 localhost 11211 2>/dev/null
 
 run-django-webpack-devserver: add-users-dev yarn-install
-	bash -c "trap 'trap - SIGINT SIGTERM ERR; kill %1' SIGINT SIGTERM ERR; $(YARN) start-dev & sleep 10 && cd swh/web && python3 manage.py runserver --nostatic --settings=$(SETTINGS_DEV)"
+	bash -c "trap 'trap - SIGINT SIGTERM ERR; kill %1' SIGINT SIGTERM ERR; \
+	$(YARN) start-dev & sleep 10 && cd swh/web && \
+	python3 manage.py runserver --nostatic --settings=$(SETTINGS_DEV)"
 
 run-django-webpack-dev: build-webpack-dev add-users-dev
 	python3 swh/web/manage.py runserver --nostatic --settings=$(SETTINGS_DEV)
@@ -83,7 +85,9 @@
 
 .PHONY: test-frontend-cmd
 test-frontend-cmd: build-webpack-test add-users-test
-	python3 swh/web/manage.py runserver --nostatic --settings=$(SETTINGS_TEST) & sleep 10 && $(YARN) run cypress run --config numTestsKeptInMemory=0 ; pkill -P $$! ; $(YARN) run mochawesome
+	bash -c "trap 'trap - SIGINT SIGTERM ERR EXIT; jobs -p | xargs -r kill' SIGINT SIGTERM ERR EXIT; \
+	python3 swh/web/manage.py runserver --nostatic --settings=$(SETTINGS_TEST) & \
+	sleep 10 && $(YARN) run cypress run --config numTestsKeptInMemory=0 && $(YARN) run mochawesome"
 
 test-frontend: export CYPRESS_SKIP_SLOW_TESTS=1
 test-frontend: test-frontend-cmd
@@ -93,7 +97,9 @@
 
 .PHONY: test-frontend-ui-cmd
 test-frontend-ui-cmd: build-webpack-test add-users-test
-	bash -c "trap 'trap - SIGINT SIGTERM ERR EXIT; jobs -p | head -1 | xargs pkill -P' SIGINT SIGTERM ERR EXIT; python3 swh/web/manage.py runserver --nostatic --settings=$(SETTINGS_TEST) & sleep 10 && $(YARN) run cypress open"
+	bash -c "trap 'trap - SIGINT SIGTERM ERR EXIT; jobs -p | xargs -r kill' SIGINT SIGTERM ERR EXIT; \
+	python3 swh/web/manage.py runserver --nostatic --settings=$(SETTINGS_TEST) & \
+	sleep 10 && $(YARN) run cypress open"
 
 test-frontend-ui: export CYPRESS_SKIP_SLOW_TESTS=1
 test-frontend-ui: test-frontend-ui-cmd