diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f499f4d..93d02b6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,36 +1,14 @@
 image: weboaks/node-karma-protractor-chrome
 
 stages:
-  - test
   - pages
+  - test
 #  - e2e
 
 cache:
   paths:
     - node_modules/
 
-test:
-  stage: test
-  script:
-    - npm i
-    - pkill Xvfb
-    - npm run test:ci
-  artifacts:
-    paths:
-      - coverage/
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    paths:
-      - node_modules/
-
-test-build:
-  stage: test
-  script:
-    - yarn install --pure-lockfile
-    - npx ng build --prod
-  only:
-    - master
-
 pages:
   stage: pages
   script:
@@ -43,10 +21,27 @@ pages:
     expire_in: '2 hours'
   only:
     - develop
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
+
+test:
+  stage: test
+  script:
+    - npm i
+    - pkill Xvfb
+    - npm run test:ci
+  artifacts:
     paths:
-      - node_modules/
+      - coverage/
+  cache:
+    policy: pull
+
+test-build:
+  stage: test
+  script:
+    - yarn install --pure-lockfile
+    - npx ng build --prod
+  only:
+    - master
+  cache:
     policy: pull
 
 #e2e: