diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb
index 3e2e6ab701..1ac68746de 100644
--- a/activerecord/test/cases/scoping/named_scoping_test.rb
+++ b/activerecord/test/cases/scoping/named_scoping_test.rb
@@ -459,4 +459,9 @@ class NamedScopingTest < ActiveRecord::TestCase
     end
     assert_equal [posts(:welcome).title], klass.all.map(&:title)
   end
+
+  def test_subclass_merges_scopes_properly
+    assert_equal 1, SpecialComment.crazy_all.count
+  end
+
 end
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index ede5fbd0c6..9d594bd7d6 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -29,6 +29,7 @@ class Comment < ActiveRecord::Base
 end
 
 class SpecialComment < Comment
+  scope :crazy_all, -> { where(body: 'go crazy').created }
 end
 
 class SubSpecialComment < SpecialComment