diff --git a/.travis.yml b/.travis.yml
index c426c5b282..010a964292 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,16 +41,17 @@ branches:
 
 stages:
   - name: Setup
+    if: branch != master AND (type = cron || type = pull_request) AND tag IS blank
   - name: "Build lib"
-    if: tag IS blank
+    if: branch != master AND (type = cron || type = pull_request) AND tag IS blank
   - name: "Check bundle"
-    if: type = push AND tag IS blank
+    if: branch != master AND type = cron AND tag IS blank   
   - name: "Trigger Alpha ADF child build"
     if: branch = develop AND type = cron
   - name: "Build"
-    if: (branch != master AND type != cron AND tag IS blank) OR type = api
+    if: branch != master AND (type = cron || type = pull_request) AND tag IS blank
   - name: "e2e Test"
-    if: (branch != master AND type != cron AND tag IS blank) OR type = api
+    if: branch != master AND (type = cron || type = pull_request) AND tag IS blank
   - name: "Release tag"
     if: branch = master