diff --git a/.travis.yml b/.travis.yml
index 96f1a24475..119151e71d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,18 +18,20 @@ cache:
   directories:
     - node_modules
 
+bundler_args: --retry 5
+
 before_install:
-  - travis_wait 15 yarn run global
+  - travis_retry yarn run global
 
 install:
-  - travis_wait 15 yarn install
+  - travis_retry yarn install
 
 before_script:
-  - travis_wait 20 yarn run build
+  - travis_wait yarn run build
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - sleep 3
 
 script:
-  - travis_wait 20 yarn run ci
+  - yarn run ci