4 files changed, 25 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index c1a8803457..39fe217777 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Ensure that the Suppressor runs before validations.
+
+    This moves the suppressor up to be run before validations rather than after
+    validations. There's no reason to validate a record you aren't planning on saving.
+
+    *Eileen M. Uchitelle*
+
 ## Rails 5.0.0.beta3 (February 24, 2016) ##
 
 *   Ensure that mutations of the array returned from `ActiveRecord::Relation#to_a`
diff --git a/activerecord/lib/active_record/suppressor.rb b/activerecord/lib/active_record/suppressor.rb
index b3644bf569..8ec4b48d31 100644
--- a/activerecord/lib/active_record/suppressor.rb
+++ b/activerecord/lib/active_record/suppressor.rb
@@ -37,7 +37,11 @@ module ActiveRecord
       end
     end
 
-    def create_or_update(*args) # :nodoc:
+    def save(*) # :nodoc:
+      SuppressorRegistry.suppressed[self.class.name] ? true : super
+    end
+
+    def save!(*) # :nodoc:
       SuppressorRegistry.suppressed[self.class.name] ? true : super
     end
   end
diff --git a/activerecord/test/cases/suppressor_test.rb b/activerecord/test/cases/suppressor_test.rb
index 72c5c16555..7d44e36419 100644
--- a/activerecord/test/cases/suppressor_test.rb
+++ b/activerecord/test/cases/suppressor_test.rb
@@ -46,7 +46,18 @@ class SuppressorTest < ActiveRecord::TestCase
     Notification.suppress { UserWithNotification.create! }
 
     assert_difference -> { Notification.count } do
-      Notification.create!
+      Notification.create!(message: "New Comment")
+    end
+  end
+
+  def test_suppresses_validations_on_create
+    assert_no_difference -> { Notification.count } do
+      Notification.suppress do
+        User.create
+        User.create!
+        User.new.save
+        User.new.save!
+      end
     end
   end
 end
diff --git a/activerecord/test/models/notification.rb b/activerecord/test/models/notification.rb
index b4b4b8f1b6..82edc64b68 100644
--- a/activerecord/test/models/notification.rb
+++ b/activerecord/test/models/notification.rb
@@ -1,2 +1,3 @@
 class Notification < ActiveRecord::Base
+  validates_presence_of :message
 end