diff --git a/Gemfile b/Gemfile
index 03c6322b6..1f05e54a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ end
 group :test, :optional => true do
   # get test coverage info on codeclimate
   gem 'codeclimate-test-reporter', '1.0.9'
-  gem 'database_cleaner', '~> 1'
+  gem 'database_cleaner', '~> 2'
   gem 'factory_bot_rails'
   gem 'minitest-stub-const'
   gem 'mocha'
diff --git a/Gemfile.lock b/Gemfile.lock
index 114746c7b..0540450b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,12 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.3.4)
     crass (1.0.6)
-    database_cleaner (1.99.0)
+    database_cleaner (2.1.0)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     date (3.4.0)
     diff-lcs (1.5.1)
     docile (1.1.5)
@@ -353,7 +358,7 @@ DEPENDENCIES
   byebug
   codeclimate-test-reporter (= 1.0.9)
   coffee-rails (~> 5.0.0)
-  database_cleaner (~> 1)
+  database_cleaner (~> 2)
   factory_bot_rails
   font-awesome-sass (~> 6.5.2)
   htmlentities