diff --git a/.travis.yml b/.travis.yml
index 25def58..65106a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ rust:
   - beta
   - nightly
 
-# only test master and tagged releases on push
 # always test things that aren't pushes (like PRs)
-if: type != push OR branch = master OR branch =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+# never test tags or pushes to non-master branches (wait for PR)
+# https://github.com/travis-ci/travis-ci/issues/2200#issuecomment-441395545)
+if: type != push OR (tag IS blank AND branch = master)
 
 before_script:
  - if [[ "$INTEGRATION" == "true" ]]; then