diff --git a/.travis.yml b/.travis.yml
index 216c0f5..72a38d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: ruby
+env:
+  - ARUBA_TIMEOUT=240
 before_install:
   - gem update --system
   - gem update bundler
diff --git a/features/support/env.rb b/features/support/env.rb
index 791b55c..106ee5d 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -2,8 +2,8 @@ require 'aruba/cucumber'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
 
-Before do
-  @aruba_timeout_seconds = 3600
+Aruba.configure do |config|
+  config.exit_timeout = Integer ENV.fetch("ARUBA_TIMEOUT") { 120 }
 end
 
 Aruba.configure do |config|