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