diff --git a/.travis.yml b/.travis.yml
index 86e197b6c..b920286e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,11 +51,6 @@ env:
 
 
 script:
-  # 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 55 contrib/ci/scripts/travis_ci_entry_point.sh || exit 1;
-    else
-      contrib/ci/scripts/travis_ci_entry_point.sh || exit 1;
-    fi
+  # Use `travis_wait` when building because some configurations don't produce an
+  # output for a long time (linking & testing)
+  - travis_wait 55 contrib/ci/scripts/travis_ci_entry_point.sh || exit 1;