diff --git a/.travis.yml b/.travis.yml
index d838cc4fd68163b8bbd3e1aeae42acf223b96b93..67f9de5e8227f64448ab58f88e78ed93b861d3f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 notifications:
   email: false
-if: tag IS present
 matrix:
   include:
   - sudo: required
diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh
index 3ed51b3af0566a567521dd227155128d9f9753d7..49119bbad561befa609311338482c88a53813a50 100755
--- a/travis/build-wheels.sh
+++ b/travis/build-wheels.sh
@@ -53,6 +53,10 @@ done
 /opt/python/cp37-cp37m/bin/pip install delocate
 /opt/python/cp37-cp37m/bin/python /io/travis/fix-wheel.py /deps/ocl-icd/COPYING
 
+if [[ "${TWINE_USERNAME}" == "" ]]; then
+    exit 0
+fi
+
 /opt/python/cp37-cp37m/bin/pip install twine
 for WHEEL in /io/wheelhouse/pyopencl*.whl; do
     # dev