diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ad3f49ad6ca326636a14b51a971efa147769e2f..f12db3d8e38fc7373c493f67e8cd9b5ea43e9f88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -243,7 +243,9 @@ test_server_functional:
   stage: test_functional
   script:
     - docker build --build-arg git_branch=$CI_BUILD_REF_SLUG --build-arg build_env=TEST -t $CI_BUILD_REF_SLUG docker/vidjil
-    - docker run $CI_BUILD_REF_SLUG HEADLESS=1 /usr/share/vidjil/server/web2py/vidjil/test/functional/launch_functional_tests test_*.rb
+    - cd docker && docker-compose up & && cd ..
+    - HEADLESS=1 make functional_server || (docker-compose stop)
+    - cd docker && docker-compose stop
   only:
     - /^feature-.*s.*\/.*$/
     - /^hotfix-.*s.*\/.*$/