diff --git a/test/cases/coerced_tests.rb b/test/cases/coerced_tests.rb
index 9445bb06b..6f0c90bf7 100644
--- a/test/cases/coerced_tests.rb
+++ b/test/cases/coerced_tests.rb
@@ -56,7 +56,7 @@ def test_partial_index_coerced
 
     t = Topic.create!(title: "abc")
     t.author_name = "John"
-    assert_queries(1) do
+    assert_queries_count(1) do
       t.valid?
     end
   end
@@ -234,7 +234,7 @@ def test_update_date_time_attributes_with_default_timezone_local
   coerce_tests! %r{an empty transaction does not raise if preventing writes}
   test "an empty transaction does not raise if preventing writes coerced" do
     ActiveRecord::Base.while_preventing_writes do
-      assert_queries(1, ignore_none: true) do
+      assert_queries_count(1, ignore_none: true) do
         Bird.transaction do
           ActiveRecord::Base.lease_connection.materialize_transactions
         end
@@ -490,8 +490,8 @@ def test_limit_with_offset_is_kept_coerced
   coerce_tests! :test_distinct_count_all_with_custom_select_and_order
   def test_distinct_count_all_with_custom_select_and_order_coerced
     accounts = Account.distinct.select("credit_limit % 10 AS the_limit").order(Arel.sql("credit_limit % 10"))
-    assert_queries(1) { assert_equal 3, accounts.count(:all) }
-    assert_queries(1) { assert_equal 3, accounts.load.size }
+    assert_queries_count(1) { assert_equal 3, accounts.count(:all) }
+    assert_queries_count(1) { assert_equal 3, accounts.load.size }
   end
 
   # Leave it up to users to format selects/functions so HAVING works correctly.
@@ -1324,7 +1324,7 @@ def test_create_without_primary_key_no_extra_query_coerced
       self.table_name = "dashboards"
     end
     klass.create! # warmup schema cache
-    assert_queries(2, ignore_none: true) { klass.create! }
+    assert_queries_count(2, ignore_none: true) { klass.create! }
   end
 end
 
@@ -1354,7 +1354,7 @@ def test_query_cached_even_when_types_are_reset_coerced
       Task.initialize_find_by_cache
       Task.define_attribute_methods
 
-      assert_queries(1, ignore_none: true) do
+      assert_queries_count(1, ignore_none: true) do
         Task.find(1)
       end
 
@@ -1454,11 +1454,11 @@ def test_relations_dont_load_all_records_in_pretty_print_coerced
   def test_empty_complex_chained_relations_coerced
     posts = Post.select("comments_count").where("id is not null").group("author_id", "id").where("legacy_comments_count > 0")
 
-    assert_queries(1) { assert_equal false, posts.empty? }
+    assert_queries_count(1) { assert_equal false, posts.empty? }
     assert_not_predicate posts, :loaded?
 
     no_posts = posts.where(title: "")
-    assert_queries(1) { assert_equal true, no_posts.empty? }
+    assert_queries_count(1) { assert_equal true, no_posts.empty? }
     assert_not_predicate no_posts, :loaded?
   end
 
@@ -2377,7 +2377,7 @@ class BasePreventWritesTest < ActiveRecord::TestCase
   coerce_tests! %r{an empty transaction does not raise if preventing writes}
   test "an empty transaction does not raise if preventing writes coerced" do
     ActiveRecord::Base.while_preventing_writes do
-      assert_queries(1, ignore_none: true) do
+      assert_queries_count(1, ignore_none: true) do
         Bird.transaction do
           ActiveRecord::Base.lease_connection.materialize_transactions
         end
diff --git a/test/cases/eager_load_too_many_ids_test_sqlserver.rb b/test/cases/eager_load_too_many_ids_test_sqlserver.rb
index 96eaa6cf9..72ba24625 100644
--- a/test/cases/eager_load_too_many_ids_test_sqlserver.rb
+++ b/test/cases/eager_load_too_many_ids_test_sqlserver.rb
@@ -11,7 +11,7 @@ def test_batch_preloading_too_many_ids
     # We Monkey patch Preloader to work with batches of 10_000 records.
     # Expect: N Books queries + Citation query
     expected_query_count = (Citation.count / in_clause_length.to_f).ceil + 1
-    assert_queries(expected_query_count) do
+    assert_queries_count(expected_query_count) do
       Citation.preload(:reference_of).to_a.size
     end
   end