diff --git a/Makefile b/Makefile
index b76406c3..978b6b55 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,16 @@ test_docker_local_1:
 	$(PY_COV) report
 	x-www-browser htmlcov/index.html
 
+test_docker_local_1_ki6:
+	rm -rf output
+	#$(PY_COV) erase
+	# Run in the same directory to make the __pycache__ valid
+	# Also change the owner of the files to the current user (we run as root like in GitHub)
+	docker run --rm -v $(CWD):$(CWD) --workdir="$(CWD)" setsoft/kicad_auto_test:ki6 \
+		/bin/bash -c "flake8 . --count --statistics ; python3-coverage run -a src/kibot --help-outputs > /dev/null; pytest-3 --log-cli-level debug -k 'test_kicad_conf_user' --test_dir output ; $(PY_COV) html; chown -R $(USER_ID):$(GROUP_ID) output/ tests/board_samples/ .coverage htmlcov/"
+	#$(PY_COV) report
+	#x-www-browser htmlcov/index.html
+
 test_docker_local:
 	rm -rf output
 	$(PY_COV) erase
@@ -81,6 +91,16 @@ test_docker_local:
 	$(PY_COV) report
 	x-www-browser htmlcov/index.html
 
+test_docker_local_ki6:
+	rm -rf output
+	$(PY_COV) erase
+	# Run in the same directory to make the __pycache__ valid
+	# Also change the owner of the files to the current user (we run as root like in GitHub)
+	docker run --rm -v $(CWD):$(CWD) --workdir="$(CWD)" setsoft/kicad_auto_test:ki6 \
+		/bin/bash -c "flake8 . --count --statistics ; python3-coverage run -a src/kibot --help-outputs ; pytest-3 --test_dir output ; $(PY_COV) html; chown -R $(USER_ID):$(GROUP_ID) output/ tests/board_samples/ .coverage htmlcov/"
+	$(PY_COV) report
+	x-www-browser htmlcov/index.html
+
 docker_shell:
 	docker run  -it --rm -v $(CWD):$(CWD) --workdir="$(CWD)" \
 	-v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$(DISPLAY) \