diff --git a/.travis.yml b/.travis.yml
index 890d9675..102f4847 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,23 @@
 language: ruby
+
 cache: bundler
+
 sudo: false
-install:
-- script/rebund download
-- travis_retry bundle install --path vendor/bundle -j8
+
 rvm:
-- 2.1
-- 2.0
-- 1.9.3
+  - 2.1
+  - 2.0
+  - 1.9.3
+
+env:
+  matrix:
+    - TEST_SUITE=test
+    - TEST_SUITE=cucumber
+
+before_script: bundle update
+
 script: script/cibuild
-after_script:
-- script/rebund upload
+
 notifications:
   irc:
     on_success: change
@@ -22,10 +29,3 @@ notifications:
   email:
     on_success: never
     on_failure: never
-env:
-  global:
-  - secure: bt5nglPTdsc0N5fB1dOJz2WbM81dGpDuVD8PnhEsxgUfoo6xavhU4+pNrUADlSUqQ1aJrdU+MKW4x+JZ2ZnJS8vOpNzRymuMZSbFaljK4pgFGiKFgBdMKxVikvoYcxKCjLAl7NJZ11W6hUw+JtJScClDZwrJJAQB6I7Isp/LsdM=
-  - secure: Ym8nx7nbfGYGo47my92M+deJykaiMkdZdb615EO51liv/xy/0aQ919Jpfieugc9d3zVnm+zFGPbpv4YzRpsik6OlVBNa4lP+BnQ27ptf5YcLWD8Hksi7845WFLecXMoaTCoYer/TvYZsIWJb2nSDMH9qbfZhnd1YZKuvUpK0rEU=
-  matrix:
-  - TEST_SUITE=test
-  - TEST_SUITE=cucumber