diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c07a74ca0adc09fba7637af5fde0e7f1241f7c70..01004fdddf8858c0ab69299de28e5dce3571d1c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
 stages:
-  - install
-  - test
+  - server-install
+  - server-test
+  - client-install
+  - client-test
 
 include:
   - local: .gitlab/server.gitlab-ci.yml
diff --git a/.gitlab/server.gitlab-ci.yml b/.gitlab/server.gitlab-ci.yml
index 481e31bb7575c6cf3248c0eeb6174437b40ed3e2..e4f75df4348505f06e21124ee8cb3c7865df8a50 100644
--- a/.gitlab/server.gitlab-ci.yml
+++ b/.gitlab/server.gitlab-ci.yml
@@ -5,6 +5,7 @@ cache:
     - server/env/
 
 before_script:
+  stage: server-install
   - python --version
   - pip install virtualenv
   - cd server/
@@ -13,6 +14,6 @@ before_script:
   - pip install -r requirements.txt
 
 test-server:
-  stage: test
+  stage: server-test
   script:
     - pytest --cov app tests/