diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71cce74035e21d2d11f6f569f26655977337ba71..9718cd2b06ba850e4b9a13edf4c07c426166b568 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,6 @@ shfmt:
 
 build require:
   stage: build
-  when: always
   before_script:
     - curl -L -o epics.tar.gz https://artifactory.esss.lu.se/artifactory/e3/epics-base-$E3_CI_BASE_VERSION.tar.gz
     - tar -zxvf epics.tar.gz
@@ -55,10 +54,13 @@ build require:
     paths:
       - epics
       - configure/*.local
+  needs: []
 
 test require:
   stage: test
   before_script:
     - source $(pwd)/epics/base-*/require/*/bin/setE3Env.bash
   script:
-    - make test
\ No newline at end of file
+    - make test
+  needs:
+    - build require
\ No newline at end of file