diff --git a/.travis.yml b/.travis.yml
index 308890e..60c7561 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,8 @@
+# Use container-based infrastructure
+sudo: false
 language: ruby
+# Travis bug, see https://github.com/bundler/bundler/pull/3559
+before_install: gem update bundler
 cache: bundler
 rvm:
   - ruby-head