3 files changed, 22 insertions, 22 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index fedd9f603c..679c515e8c 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -3,14 +3,14 @@ require "cases/helper"
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
+    @subscriber = SQLSubscriber.new
+    ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
     @connection = ActiveRecord::Base.connection
-    @connection.extend(LogIntercepter)
-    @connection.intercepted = true
   end
 
   def teardown
-    @connection.intercepted = false
-    @connection.logged = []
+    ActiveSupport::Notifications.unsubscribe(@subscriber)
+    super
   end
 
   def test_no_automatic_reconnection_after_timeout
@@ -72,14 +72,14 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   def test_logs_name_show_variable
     @connection.show_variable 'foo'
-    assert_equal "SCHEMA", @connection.logged[0][1]
+    assert_equal "SCHEMA", @subscriber.logged[0][1]
   end
 
   def test_logs_name_rename_column_sql
     @connection.execute "CREATE TABLE `bar_baz` (`foo` varchar(255))"
-    @connection.logged = []
+    @subscriber.logged.clear
     @connection.send(:rename_column_sql, 'bar_baz', 'foo', 'foo2')
-    assert_equal "SCHEMA", @connection.logged[0][1]
+    assert_equal "SCHEMA", @subscriber.logged[0][1]
   ensure
     @connection.execute "DROP TABLE `bar_baz`"
   end
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index f482a36d86..59d95d1293 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -5,21 +5,6 @@ module ActiveRecord
     class NonExistentTable < ActiveRecord::Base
     end
 
-    class SQLSubscriber
-      attr_reader :logged
-
-      def initialize
-        @logged = []
-      end
-
-      def start(name, id, payload)
-        @logged << [payload[:sql], payload[:name], payload[:binds]]
-      end
-
-      def finish(name, id, payload)
-      end
-    end
-
     def setup
       super
       @subscriber = SQLSubscriber.new
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index f96978aff8..5b5f700cfe 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -134,6 +134,21 @@ module LogIntercepter
   end
 end
 
+class SQLSubscriber
+  attr_reader :logged
+
+  def initialize
+    @logged = []
+  end
+
+  def start(name, id, payload)
+    @logged << [payload[:sql], payload[:name], payload[:binds]]
+  end
+
+  def finish(name, id, payload); end
+end
+
+
 module InTimeZone
   private