diff --git a/gitlab-ci/functional-api-test.sh b/gitlab-ci/functional-api-test.sh
index 41526a8..f7d1bcf 100755
--- a/gitlab-ci/functional-api-test.sh
+++ b/gitlab-ci/functional-api-test.sh
@@ -68,6 +68,7 @@ for test in $(cat test/script/run_sequence.txt); do
 done
 
 echo "Stop all services"
+sleep 10
 supervisorctl stop icwmpd
 
 sleep 10
diff --git a/gitlab-ci/setup.sh b/gitlab-ci/setup.sh
index 0240c5c..8b1d817 100755
--- a/gitlab-ci/setup.sh
+++ b/gitlab-ci/setup.sh
@@ -28,5 +28,6 @@ echo "Starting base services"
 cp ./gitlab-ci/icwmp-base.conf /etc/supervisor/conf.d/
 supervisorctl reread
 supervisorctl update
-sleep 5
+supervisorctl restart all
+sleep 10
 supervisorctl status