1 files changed, 2 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
index 2acb64f81c..cb024463c9 100644
--- a/activerecord/test/cases/adapters/postgresql/citext_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -10,12 +10,7 @@ if ActiveRecord::Base.connection.supports_extensions?
     def setup
       @connection = ActiveRecord::Base.connection
 
-      unless @connection.extension_enabled?('citext')
-        @connection.enable_extension 'citext'
-        @connection.commit_db_transaction
-      end
-
-      @connection.reconnect!
+      enable_extension!('citext', @connection)
 
       @connection.create_table('citexts') do |t|
         t.citext 'cival'
@@ -24,7 +19,7 @@ if ActiveRecord::Base.connection.supports_extensions?
 
     teardown do
       @connection.execute 'DROP TABLE IF EXISTS citexts;'
-      @connection.execute 'DROP EXTENSION IF EXISTS citext CASCADE;'
+      disable_extension!('citext', @connection)
     end
 
     def test_citext_enabled