diff --git a/.travis.yml b/.travis.yml
index b179c5bfe..672d8ed52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,11 @@ env:
 #    - os: osx
 #      osx_image: xcode 8.2
 script:
-  # Use `travis_wait` to handle commands that don't show output for a long period of time.
-  # Currently this is the LTO build which can be very slow.
-  # Allow at most 45 minutes for the build.
-  - travis_wait 45 contrib/ci/scripts/travis_ci_entry_point.sh
+  # Use `travis_wait` when doing LTO builds because this configuration will
+  # have long link times during which it will not show any output which
+  # TravisCI might kill due to perceived inactivity.
+  - if [ "X${USE_LTO}" = "X1" ]; then
+      travis_wait 45 contrib/ci/scripts/travis_ci_entry_point.sh || exit 1;
+    else
+      contrib/ci/scripts/travis_ci_entry_point.sh || exit 1;
+    fi