diff --git a/Gemfile b/Gemfile
index 2f4925ef1..275a7a474 100644
--- a/Gemfile
+++ b/Gemfile
@@ -283,7 +283,7 @@ group :test do
   # Cucumber (integration tests)
 
   gem "capybara",           "2.18.0"
-  gem "database_cleaner",   "1.6.1"
+  gem "database_cleaner",   "1.6.2"
   gem "poltergeist",        "1.16.0"
 
   gem "cucumber-api-steps", "0.13", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index fb83b834d..9b88921e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,7 +156,7 @@ GEM
       nokogiri (~> 1.5)
       railties (>= 4, < 5.2)
     cucumber-wire (0.0.1)
-    database_cleaner (1.6.1)
+    database_cleaner (1.6.2)
     devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -780,7 +780,7 @@ DEPENDENCIES
   coveralls (= 0.8.21)
   cucumber-api-steps (= 0.13)
   cucumber-rails (= 1.5.0)
-  database_cleaner (= 1.6.1)
+  database_cleaner (= 1.6.2)
   devise (= 4.4.3)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
diff --git a/features/support/env.rb b/features/support/env.rb
index 7ee2f0e9d..631a207ac 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -53,9 +53,6 @@ Capybara.default_max_wait_time = 30
 # of your scenarios, as this makes it hard to discover errors in your application.
 ActionController::Base.allow_rescue = false
 
-# TODO: Temporary fix for rails 5, remove the next line after a new version of database_cleaner is released.
-# See https://github.com/DatabaseCleaner/database_cleaner/issues/445
-Cucumber::Rails::Database.javascript_strategy = :truncation, {except: %w[ar_internal_metadata]}
 Cucumber::Rails::Database.autorun_database_cleaner = true
 Cucumber::Rails::World.use_transactional_tests = false