diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6464b73d925a0d349b7db1a65fccc76688814a97..5d59932d50e6d3677aa46024198257117b8f60ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,6 +89,8 @@ build-linux:
   stage: build
   tags:
     - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   needs:
     - job: dl-mage-linux
       artifacts: true
@@ -138,6 +140,8 @@ build-windows:
   stage: build
   tags:
     - wine
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   needs:
     - job: dl-mage-windows
       artifacts: true
@@ -167,6 +171,11 @@ build-windows:
 
 test:
   stage: test
+  tags:
+    - linux
+  needs:
+    - job: set-version
+      artifacts: true
   script:
     - echo "TODO PAMHYR tests"