diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f760a164fc49a6ac2ce5894d0f50f1868ebe206b..88a0926e7e051ec63df1277a87cf6a88011e0707 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,20 @@
+image: node:4.2.2
+
+install:
+  stage: install
+  script:
+    - npm install
+    - cd server && npm install && cd ..
+    - cd client && npm install
+
 build:
   stage: build
   script:
-    - echo "build"
+    - cd server && npm run build && cd ..
+    - cd client && npm build
 
 test:
   stage: test
   script:
-    - echo "test"
-
-deploy:
-  stage: deploy
-  script:
-    - echo "deploy"
-  only:
-    - master
+    - cd server && npm test && cd ..
+    - cd client && npm test
\ No newline at end of file