diff --git a/Gemfile b/Gemfile
index 23e917a..d99008c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ group :test, :development do
 end
 
 group :test do
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'shoulda'
   gem 'poltergeist'
   gem 'database_cleaner'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f5226f..ea0a63e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,10 +118,10 @@ GEM
     erubis (2.7.0)
     excon (0.57.1)
     execjs (2.7.0)
-    factory_girl (4.8.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     ffi (1.9.21)
     fivemat (1.3.5)
@@ -345,7 +345,7 @@ DEPENDENCIES
   dotenv-rails
   dragonfly
   dragonfly-s3_data_store
-  factory_girl_rails
+  factory_bot_rails
   fivemat
   jquery-rails
   kaminari
diff --git a/spec/factories/categories.rb b/spec/factories/categories.rb
index 8ce0b4e..c14b5a1 100644
--- a/spec/factories/categories.rb
+++ b/spec/factories/categories.rb
@@ -1,6 +1,4 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
+FactoryBot.define do
   factory :category do
     sequence(:name) { |n| "Test Category #{n}" }
   end
diff --git a/spec/factories/contacts.rb b/spec/factories/contacts.rb
index 7dd2aa6..b4b166c 100644
--- a/spec/factories/contacts.rb
+++ b/spec/factories/contacts.rb
@@ -1,6 +1,4 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
+FactoryBot.define do
   factory :contact do
     email "test@danbarberphoto.com"
     name "Dan Barber"
diff --git a/spec/factories/pages.rb b/spec/factories/pages.rb
index 2e93c52..c8018a7 100644
--- a/spec/factories/pages.rb
+++ b/spec/factories/pages.rb
@@ -1,6 +1,4 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
+FactoryBot.define do
   factory :page do
     name "page"
     title "Page"
diff --git a/spec/factories/photos.rb b/spec/factories/photos.rb
index e86d148..45e68f3 100644
--- a/spec/factories/photos.rb
+++ b/spec/factories/photos.rb
@@ -1,6 +1,4 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
+FactoryBot.define do
   factory :photo do
     title "A Photo"
     description "A lovely photo of a tree"
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index b199ca6..2d727fa 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     email "test@example.com"
     password_digest "password"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7524347..71dabae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -25,8 +25,8 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
 
-  # Include FactoryGirl methods
-  config.include FactoryGirl::Syntax::Methods
+  # Include FactoryBot methods
+  config.include FactoryBot::Syntax::Methods
   config.include Ajax, type: :feature
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures