diff --git a/.travis.yml b/.travis.yml
index 1e40c5fe6..3091124a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ sudo: false
 cache:
   bundler: true
   directories:
-    - public/assets
     - app/assets/images
 
 branches:
diff --git a/Gemfile b/Gemfile
index 63f3e9c7e..0c5bf9629 100644
--- a/Gemfile
+++ b/Gemfile
@@ -246,7 +246,7 @@ group :test do
   # Cucumber (integration tests)
 
   gem 'capybara',           '2.4.4'
-  gem 'database_cleaner',   '1.4.0'
+  gem 'database_rewinder',  '0.5.1'
   gem 'selenium-webdriver', '2.45.0'
 
   # General helpers
diff --git a/Gemfile.lock b/Gemfile.lock
index a5a9c5cfc..584ca38f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,7 +139,7 @@ GEM
       mime-types (>= 1.16, < 3)
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
-    database_cleaner (1.4.0)
+    database_rewinder (0.5.1)
     debugger-linecache (1.2.0)
     devise (3.4.1)
       bcrypt (~> 3.0)
@@ -703,7 +703,7 @@ DEPENDENCIES
   compass-rails (= 2.0.4)
   configurate (= 0.2.0)
   cucumber-rails (= 1.4.2)
-  database_cleaner (= 1.4.0)
+  database_rewinder (= 0.5.1)
   devise (= 3.4.1)
   devise-token_authenticatable (~> 0.3.0)
   devise_lastseenable (= 0.0.4)
diff --git a/features/support/env.rb b/features/support/env.rb
index c0d3be812..44b379203 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -45,12 +45,15 @@ Capybara.default_wait_time = 15
 # of your scenarios, as this makes it hard to discover errors in your application.
 ActionController::Base.allow_rescue = false
 
-require 'database_cleaner'
-require 'database_cleaner/cucumber'
-DatabaseCleaner.strategy = :truncation
-DatabaseCleaner.orm = "active_record"
+Cucumber::Rails::Database.autorun_database_cleaner = false
 Cucumber::Rails::World.use_transactional_fixtures = false
 
+DatabaseRewinder.clean_all
+
+After do
+  DatabaseRewinder.clean
+end
+
 require File.join(File.dirname(__FILE__), "integration_sessions_controller")
 require File.join(File.dirname(__FILE__), "poor_mans_webmock")
 
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 9354df985..344590cfe 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -4,7 +4,7 @@ namespace :ci do
     task :other => [ :prepare_db, "tests:generate_fixtures", :spec, "jasmine:ci" ]
 
     desc "Run cucumber"
-    task :cucumber => [ :prepare_db, "assets:precompile", "rake:cucumber" ]
+    task :cucumber => [ :prepare_db, "rake:cucumber" ]
 
     desc "Prepare db"
     task :prepare_db => [ "db:create", "db:test:load"]