1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 4a0e6f497f..8f2682c781 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -124,7 +124,7 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_generate_valid_sql_with_joins_and_group
-    assert_nothing_raised ActiveRecord::StatementInvalid do
+    assert_nothing_raised do
       AuditLog.joins(:developer).group(:id).count
     end
   end
@@ -545,8 +545,8 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal 7, Company.includes(:contracts).sum(:developer_id)
   end
 
-  def test_from_option_with_specified_index
-    if Edge.connection.adapter_name == 'MySQL' or Edge.connection.adapter_name == 'Mysql2'
+  if current_adapter?(:Mysql2Adapter)
+    def test_from_option_with_specified_index
       assert_equal Edge.count(:all), Edge.from('edges USE INDEX(unique_edge_index)').count(:all)
       assert_equal Edge.where('sink_id < 5').count(:all),
           Edge.from('edges USE INDEX(unique_edge_index)').where('sink_id < 5').count(:all)
@@ -742,7 +742,7 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_reference_correct_aliases_while_joining_tables_of_has_many_through_association
-    assert_nothing_raised ActiveRecord::StatementInvalid do
+    assert_nothing_raised do
       developer = Developer.create!(name: 'developer')
       developer.ratings.includes(comment: :post).where(posts: { id: 1 }).count
     end