diff --git a/.travis.yml b/.travis.yml
index da4e27666ef505e69f625d499e337774db1f73f3..e4b3101718550c23608ea208bca31f4fbbac7f53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ cache:
   bundler: true
   directories:
     - app/assets/images
-    - tmp/cache/assets/test
+    - tmp/cache/assets
 
 branches:
   only:
diff --git a/config/environments/test.rb b/config/environments/test.rb
index ad06a51ac984c377400aadc4e02b0bf8bdb4b8e5..7df9c1b93c6ab51f5c0a079cb0891b38f6fb508b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -22,6 +22,14 @@ Diaspora::Application.configure do
   # Precompile poltergeist_disable_transition.css for tests
   config.assets.precompile += %w[poltergeist_disable_transition.css]
 
+  # Don't precompile all themes for tests
+  config.assets.precompile -= %w[color_themes/*/desktop.css color_themes/*/mobile.css]
+  config.assets.precompile += %w[
+    color_themes/original/desktop.css
+    color_themes/dark_green/desktop.css
+    color_themes/original/mobile.css
+  ]
+
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false