diff --git a/cicd/stages/release.yml b/cicd/stages/release.yml
index 02d5f2d9ebe1325bcffaf3df49bb4000f60c2342..3e06feb1098cb14ddf60f2d33d66caff7a8f156b 100644
--- a/cicd/stages/release.yml
+++ b/cicd/stages/release.yml
@@ -5,9 +5,9 @@ create-packages:
   rules:
     - if: $CI_COMMIT_TAG
   needs:
-    # - job: test-x86_64
-      # optional: false
-      # artifacts: true
+    - job: test-x86_64
+      optional: false
+      artifacts: true
     - job: build-android
       optional: false
       artifacts: true
diff --git a/cicd/stages/test.yml b/cicd/stages/test.yml
index f1567e6e18806d3f9c604306505a799225296d0d..b6f63a49c8d51f0364139c8d2bc8145527592316 100644
--- a/cicd/stages/test.yml
+++ b/cicd/stages/test.yml
@@ -8,12 +8,17 @@ test-x86_64:
     - job: build-android
       optional: false
       artifacts: true
-  rules:
-    - if: ${QDS_CI_SKIP_TESTS} == "false"
   variables:
     GIT_SUBMODULE_STRATEGY: none
     QDS_CI_JOB_TEST_RESULTS_PATH: ${CI_PROJECT_DIR}/test
   script:
+    - |
+      if [[ ${QDS_CI_SKIP_TESTS} == "false" ]]; then
+        echo "Running tests";
+      else
+        echo "Skipping tests";
+        exit 0;
+      fi
     - |
       export ANDROID_SDK_ROOT=/opt/android
       export PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/