diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84d1d3ba639c5eb63aba56f9a4265bcde1eb4d88..15655089852cd7699500020bacb6da1e34486825 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ job test:
     - echo "SQL_DATABASE=${SQL_DATABASE}" >> app/env
     - make install
     - make server-start
-    - make test
+    - make -k test
     - make server-stop
     - mysql -u $SQL_USER -p$SQL_PASSWORD -e "DROP DATABASE $SQL_DATABASE"
   tags:
diff --git a/Makefile b/Makefile
index 2d5d78c76d9b387df6230c866a02471eee558f9c..6c61db801c9cf9f1f862f5214a471d18787637b9 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ server-start: server-stop ## Launch a local server
 	@echo "\033[32mServer running. (http://127.0.0.1:8000)\033[0m"
 
 server-stop: ## Stop local server if running
-	@ps -aux | grep "[p]hp -S 127.0.0.1:8000" | grep -v grep | awk '{print $$2}' | xargs -r -n 1 kill
+	-@ps -aux | grep "[p]hp -S 127.0.0.1:8000" | grep -v grep | awk '{print $$2}' | xargs -r -n 1 kill
 	@echo "\033[32mServer stopped. (http://127.0.0.1:8000)\033[0m"
 
 cs-fix: ## Fix CS