diff --git a/Gemfile b/Gemfile
index a83014ef03..3fa5c78ca4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -144,6 +144,7 @@ group :test, :development do
   # Pretty printed test output
   gem 'atomic'
   gem 'awesome_print'
+  gem 'bullet'
   gem 'capybara'
   gem 'database_cleaner', require: false
   gem "factory_bot_rails", '5.2.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index b3a698156b..29a1e3b326 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,6 +124,9 @@ GEM
     bugsnag (6.19.0)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
+    bullet (6.1.4)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.1.3)
     cancancan (1.7.1)
     capybara (3.32.2)
@@ -700,6 +703,7 @@ GEM
     unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
+    uniform_notifier (1.14.1)
     warden (1.2.7)
       rack (>= 1.0)
     webdrivers (4.6.0)
@@ -742,6 +746,7 @@ DEPENDENCIES
   awesome_print
   aws-sdk (= 1.67.0)
   bugsnag
+  bullet
   byebug
   cancancan (~> 1.7.0)
   capybara
diff --git a/Gemfile_next.lock b/Gemfile_next.lock
index 3f9065b3b1..cd7a1c4a9f 100644
--- a/Gemfile_next.lock
+++ b/Gemfile_next.lock
@@ -123,6 +123,9 @@ GEM
     bugsnag (6.18.0)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
+    bullet (6.1.4)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.0.1)
     cancancan (1.7.1)
     capybara (3.15.0)
@@ -524,6 +527,7 @@ GEM
     unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
+    uniform_notifier (1.14.1)
     warden (1.2.9)
       rack (>= 2.0.9)
     webdrivers (4.2.0)
@@ -568,6 +572,7 @@ DEPENDENCIES
   awesome_print
   aws-sdk (= 1.67.0)
   bugsnag
+  bullet
   byebug
   cancancan (~> 1.7.0)
   capybara
diff --git a/config/initializers/bullet.rb b/config/initializers/bullet.rb
new file mode 100644
index 0000000000..89ba05a6c3
--- /dev/null
+++ b/config/initializers/bullet.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+if defined?(Bullet)
+  Rails.application.config.after_initialize do
+    Bullet.enable = true
+    Bullet.bullet_logger = true
+    Bullet.rails_logger = true
+  end
+end