diff --git a/features/support/env.rb b/features/support/env.rb
index 5319c91f7..4a98d4715 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -25,7 +25,10 @@ require 'cucumber/api_steps'
 Capybara.default_selector = :css
 
 # We have a ridiculously high wait time to account for build machines of various beefiness.
-Capybara.default_wait_time = 30
+# Capybara.default_wait_time = 30
+
+# While there are a lot of failures, wait less, avoiding travis timeout
+Capybara.default_wait_time = 3
 
 # If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere