diff --git a/app/controllers/health_checks_controller.rb b/app/controllers/health_checks_controller.rb
index 465e3bc209..970f6c0e1b 100644
--- a/app/controllers/health_checks_controller.rb
+++ b/app/controllers/health_checks_controller.rb
@@ -39,7 +39,7 @@ def check
 
   def check_database
     raise 'Unable to connect to Database' unless ActiveRecord::Base.connection.active?
-    raise 'Unable to connect to Database - pending migrations' unless ActiveRecord::Migration.check_pending!.nil?
+    raise 'Unable to connect to Database - pending migrations' unless ActiveRecord::Migration.check_all_pending!.nil?
   rescue StandardError => e
     raise "Unable to connect to Database - #{e}"
   end
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 0328dc8b8f..f9b1806943 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -48,7 +48,7 @@
       it 'fails if the attachement is too large' do
         site_setting = build(:site_setting, image: fixture_file_upload(file_fixture('large-avatar.jpg'), 'image/jpeg'))
         expect(site_setting).to be_invalid
-        expect(site_setting.errors).to be_of_kind(:image, :file_size_out_of_range)
+        expect(site_setting.errors).to be_of_kind(:image, :file_size_not_less_than)
       end
     end
   end