diff --git a/Gemfile b/Gemfile
index 9c81bf049..ed9d6fe56 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ end
 group :development, :test do
   gem 'bullet', '~> 5.7.0'
   gem 'byebug', '~> 9.1.0'
-  gem 'factory_girl_rails', '~> 4.9.0'
+  gem 'factory_bot_rails', '~> 4.8.2'
   gem 'faker', '~> 1.8.7'
   gem 'i18n-tasks', '~> 0.9.15'
   gem 'knapsack_pro', '~> 0.53.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d54709098..e7af56134 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,10 +153,10 @@ GEM
     erubi (1.7.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_girl (4.9.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faker (1.8.7)
       i18n (>= 0.7)
@@ -517,7 +517,7 @@ DEPENDENCIES
   devise-async (~> 0.10.2)
   devise_security_extension (~> 0.10.0)
   email_spec (~> 2.1.0)
-  factory_girl_rails (~> 4.9.0)
+  factory_bot_rails (~> 4.8.2)
   faker (~> 1.8.7)
   foundation-rails (~> 6.2.4.0)
   foundation_rails_helper (~> 2.0.0)
diff --git a/spec/factories.rb b/spec/factories.rb
index 8a32c4b9e..fd67fc4fc 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :local_census_record, class: 'LocalCensusRecord' do
     document_number '12345678A'
     document_type 1
@@ -136,7 +136,7 @@ FactoryGirl.define do
 
     trait :flagged do
       after :create do |debate|
-        Flag.flag(FactoryGirl.create(:user), debate)
+        Flag.flag(create(:user), debate)
       end
     end
 
@@ -150,7 +150,7 @@ FactoryGirl.define do
 
     trait :conflictive do
       after :create do |debate|
-        Flag.flag(FactoryGirl.create(:user), debate)
+        Flag.flag(create(:user), debate)
         4.times { create(:vote, votable: debate) }
       end
     end
@@ -182,7 +182,7 @@ FactoryGirl.define do
 
     trait :flagged do
       after :create do |proposal|
-        Flag.flag(FactoryGirl.create(:user), proposal)
+        Flag.flag(create(:user), proposal)
       end
     end
 
@@ -200,7 +200,7 @@ FactoryGirl.define do
 
     trait :conflictive do
       after :create do |debate|
-        Flag.flag(FactoryGirl.create(:user), debate)
+        Flag.flag(create(:user), debate)
         4.times { create(:vote, votable: debate) }
       end
     end
@@ -430,7 +430,7 @@ FactoryGirl.define do
 
     trait :flagged do
       after :create do |debate|
-        Flag.flag(FactoryGirl.create(:user), debate)
+        Flag.flag(create(:user), debate)
       end
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 579fd5ac2..d024a44c2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'database_cleaner'
 require 'email_spec'
 require 'devise'
@@ -14,7 +14,7 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
   config.include Devise::TestHelpers, type: :controller
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include(EmailSpec::Helpers)
   config.include(EmailSpec::Matchers)
   config.include(CommonActions)