diff --git a/Gemfile b/Gemfile
index c9adaeabdb..bd7b44dfac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,9 @@ gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
 gem 'pg',     '~> 1.0'   if ENV['DB'] == 'postgresql'
 
 group :development, :test do
-  unless ENV['CI']
+  if ENV['CI']
+    gem 'sprockets', '< 4.0' # Sprockets 4 has serious issues with libsass on Linux machines
+  else
     gem 'launchy'
     gem 'annotate'
     gem 'bumpy'
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 7a771fd670..012a9fa614 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -93,7 +93,6 @@
       # towards the timing of the first feature spec.
       start = Time.now
       puts "Preloading assets."
-      Rails.application.assets.cache.clear
       Rails.application.precompiled_assets
       puts "Done in #{(Time.now - start).round(2)}s"
     end