diff --git a/.appveyor.yml b/.appveyor.yml
index d86f7fce..c40fc04c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,8 @@ before_build:
 build_script:
   # Un-comment if you're in deep troubles...
   # - set SCONS_MSCOMMON_DEBUG=-
-  - scons platform=%TARGET_PLATFORM% release_suffix=%APPVEYOR_REPO_TAG_NAME% sample=true release
+  - ps: if($env:APPVEYOR_REPO_TAG -eq "false") { $env:SAMPLE_ARG = "sample=true" }
+  - scons platform=%TARGET_PLATFORM% release_suffix=%APPVEYOR_REPO_TAG_NAME% %SAMPLE_ARG% release
 
 after_build:
   - ls -l build
diff --git a/.travis.yml b/.travis.yml
index b30e0865..69b9010a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,9 +79,10 @@ before_script:
 
 script:
   - set -e  # Enable fail on first error
+  - if [[ "$TRAVIS_TAG" == "" ]]; then export SAMPLE_ARG='sample=true'; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons platform=$TARGET_PLATFORM checkstyle; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH sample=true release; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH sample=true release; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH $SAMPLE_ARG release; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH $SAMPLE_ARG release; fi
 # Tests need x11 server with opengl3 or compile godot with platform=server (both not working so far...)
   # - LIBGL_ALWAYS_SOFTWARE=1 scons debugger=valgrind platform=$TARGET_PLATFORM CC=$CC test
   - set +e