diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93a544caa0152ff2711fdefd5ddc057b30369aba..d4f556c458587e93c9785408d84d8733de4ac073 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,19 +9,14 @@ cache:
   - client/node_modules/
   - server/node_modules/
 
-build:
+build_and_test:
   stage: build
   before_script:
     - npm --silent install
     - cd server && npm --silent install
-    - pwd
     - cd ../client && npm --silent install
   script:
     - npm build
-
-test:
-  stage: test
-  script:
-    - cd server && npm test
-    - pwd
+  after_script:
+    - cd ../server && npm test
     - cd ../client && npm test
\ No newline at end of file