diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8ba836..1b4c5c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,16 +72,13 @@ upload-release:
 test-prerelease:
   stage: test
   rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH == "master" && not($CI_COMMIT_TAG)'
   script:    
     - echo $CI_COMMIT_TAG
 
 test-release:
   stage: test
   rules:
-    - if: $CI_COMMIT_TAG
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG'
   script:    
     - echo $