diff --git a/Gemfile b/Gemfile
index 765b4d7de..ced6614ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,7 +78,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'database_cleaner', '~> 1.99.0'
+  gem 'database_cleaner', '~> 2.1.0'
   gem 'guard-rspec', require: false
   gem 'listen', '~> 3.8'
   gem 'mock_redis'
diff --git a/Gemfile.lock b/Gemfile.lock
index 227817122..ccc08240a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,7 +124,12 @@ GEM
       rexml
     crass (1.0.6)
     dalli (3.2.5)
-    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.3.3)
     deep_cloneable (3.2.0)
       activerecord (>= 3.1.0, < 8)
@@ -529,7 +534,7 @@ DEPENDENCIES
   aws-sdk (~> 2.10)
   azure-storage-blob
   dalli
-  database_cleaner (~> 1.99.0)
+  database_cleaner (~> 2.1.0)
   deep_cloneable (~> 3.2.0)
   devise (~> 4.9)
   doorkeeper (~> 4.4)