2 files changed, 6 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index 91fd17e572..917fe6cf52 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -72,6 +72,6 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
     def extension_name(model)
       builder = ActiveRecord::Associations::Builder::HasMany.new(model, :association_name, nil, {}) { }
       builder.send(:wrap_block_extension)
-      builder.options[:extend].first.name
+      builder.extension_module.name
     end
 end
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 89f818a689..034339e413 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -191,11 +191,14 @@ module ActiveRecord
     end
 
     test 'extending!' do
-      mod = Module.new
+      mod, mod2 = Module.new, Module.new
 
       assert relation.extending!(mod).equal?(relation)
-      assert [mod], relation.extending_values
+      assert_equal [mod], relation.extending_values
       assert relation.is_a?(mod)
+
+      relation.extending!(mod2)
+      assert_equal [mod, mod2], relation.extending_values
     end
 
     test 'extending! with empty args' do