diff --git a/.travis.yml b/.travis.yml
index bbc17822c5391e3def7b98363169a106c1902bfc..da4e27666ef505e69f625d499e337774db1f73f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ cache:
   bundler: true
   directories:
     - app/assets/images
+    - tmp/cache/assets/test
 
 branches:
   only:
diff --git a/features/support/env.rb b/features/support/env.rb
index 393446b649b4d6512939be65a5dac2533fe785fe..37b6afe95e56fa2d564d6adf83d2a9479a0083bf 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -23,7 +23,7 @@ Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
 Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
 
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, timeout: 80)
+  Capybara::Poltergeist::Driver.new(app, timeout: 30)
 end
 
 Capybara.javascript_driver = :poltergeist