diff --git a/Makefile b/Makefile
index 50e38c9fb..ab395230a 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@ spcc_internal: $(SPCC_DEPS)
 .PHONY: pytest_internal # Run pytest
 pytest_internal:
 	poetry run pytest --version
-	MKL_NUM_THREADS=4 OMP_NUM_THREADS=4 poetry run pytest $(TEST) \
+	poetry run pytest $(TEST) \
 	-svv \
 	--count=$(COUNT) \
 	--randomly-dont-reorganize \
@@ -229,7 +229,7 @@ pytest_internal:
 # --durations=10 is to show the 10 slowest tests
 .PHONY: pytest_internal_parallel # Run pytest with multiple CPUs
 pytest_internal_parallel:
-	"$(MAKE)" pytest_internal PYTEST_OPTIONS="-n $(N_CPU) --durations=10 ${PYTEST_OPTIONS}"
+	"$(MAKE)" pytest_internal PYTEST_OPTIONS="-n auto --durations=10 ${PYTEST_OPTIONS}"
 
 # --global-coverage-infos-json=global-coverage-infos.json is to dump the coverage report in the file 
 # --cov PATH is the directory PATH to consider for coverage. Default to SRC_DIR=src