diff --git a/.travis.yml b/.travis.yml
index 48fb659fece..6822bb9e6b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,13 @@ env:
 
 # Stages are documented here: https://docs.travis-ci.com/user/build-stages
 stages:
-  - &bootstrap Bootstrap Pants
+  - name: &bootstrap Bootstrap Pants
+    if: type != cron
+  - name: &bootstrap_cron Bootstrap Pants (Cron)
+    if: type = cron
   - name: &test Test Pants
     if: type != cron
-  - name: &cron Cron
+  - name: &test_cron Test Pants (Cron)
     if: type = cron
   - name: &build_stable Deploy Pants Pex
     if: tag IS present AND tag =~ ^release_.*$
@@ -139,7 +142,7 @@ base_linux_test_config: &base_linux_test_config
 py27_linux_test_config: &py27_linux_test_config
   <<: *py27_linux_config
   <<: *base_linux_test_config
-  stage: *cron
+  stage: *test_cron
   env:
     - &py27_linux_test_config_env BOOTSTRAPPED_PEX_KEY_SUFFIX=py27.linux
 
@@ -194,7 +197,7 @@ base_osx_test_config: &base_osx_test_config
 py27_osx_test_config: &py27_osx_test_config
   <<: *py27_osx_config
   <<: *base_osx_test_config
-  stage: *cron
+  stage: *test_cron
   env:
     - &py27_osx_test_config_env BOOTSTRAPPED_PEX_KEY_SUFFIX=py27.osx
 
@@ -373,7 +376,7 @@ cargo_audit: &cargo_audit
   os: linux
   dist: xenial
   sudo: required
-  stage: *cron
+  stage: *test_cron
   script:
     - ./build-support/bin/travis-ci.sh -a
 
@@ -685,8 +688,13 @@ deploy_unstable_multiplatform_pex: &deploy_unstable_multiplatform_pex
 matrix:
   include:
     - <<: *py27_linux_build_engine
+    - <<: *py27_linux_build_engine
+      stage: *bootstrap_cron
     - <<: *py36_linux_build_engine
+
+    - <<: *py27_osx_build_engine
     - <<: *py27_osx_build_engine
+      stage: *bootstrap_cron
     - <<: *py36_osx_build_engine
 
     - <<: *py27_lint
diff --git a/build-support/travis/travis.yml.mustache b/build-support/travis/travis.yml.mustache
index 0d8cf93e5e1..04c162cc414 100644
--- a/build-support/travis/travis.yml.mustache
+++ b/build-support/travis/travis.yml.mustache
@@ -18,10 +18,13 @@ env:
 
 # Stages are documented here: https://docs.travis-ci.com/user/build-stages
 stages:
-  - &bootstrap Bootstrap Pants
+  - name: &bootstrap Bootstrap Pants
+    if: type != cron
+  - name: &bootstrap_cron Bootstrap Pants (Cron)
+    if: type = cron
   - name: &test Test Pants
     if: type != cron
-  - name: &cron Cron
+  - name: &test_cron Test Pants (Cron)
     if: type = cron
   - name: &build_stable Deploy Pants Pex
     if: tag IS present AND tag =~ ^release_.*$
@@ -129,7 +132,7 @@ base_linux_test_config: &base_linux_test_config
 py27_linux_test_config: &py27_linux_test_config
   <<: *py27_linux_config
   <<: *base_linux_test_config
-  stage: *cron
+  stage: *test_cron
   env:
     - &py27_linux_test_config_env BOOTSTRAPPED_PEX_KEY_SUFFIX=py27.linux
 
@@ -176,7 +179,7 @@ base_osx_test_config: &base_osx_test_config
 py27_osx_test_config: &py27_osx_test_config
   <<: *py27_osx_config
   <<: *base_osx_test_config
-  stage: *cron
+  stage: *test_cron
   env:
     - &py27_osx_test_config_env BOOTSTRAPPED_PEX_KEY_SUFFIX=py27.osx
 
@@ -337,7 +340,7 @@ cargo_audit: &cargo_audit
   os: linux
   dist: xenial
   sudo: required
-  stage: *cron
+  stage: *test_cron
   script:
     - ./build-support/bin/travis-ci.sh -a
 
@@ -632,8 +635,13 @@ deploy_unstable_multiplatform_pex: &deploy_unstable_multiplatform_pex
 matrix:
   include:
     - <<: *py27_linux_build_engine
+    - <<: *py27_linux_build_engine
+      stage: *bootstrap_cron
     - <<: *py36_linux_build_engine
+
+    - <<: *py27_osx_build_engine
     - <<: *py27_osx_build_engine
+      stage: *bootstrap_cron
     - <<: *py36_osx_build_engine
 
     - <<: *py27_lint