1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 7d8a83a4dd..97a8a257c5 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -21,12 +21,7 @@ if ActiveRecord::Base.connection.supports_extensions?
     def setup
       @connection = ActiveRecord::Base.connection
 
-      unless @connection.extension_enabled?("hstore")
-        @connection.enable_extension "hstore"
-        @connection.commit_db_transaction
-      end
-
-      @connection.reconnect!
+      enable_extension!("hstore", @connection)
 
       @connection.transaction do
         @connection.create_table("hstores") do |t|
@@ -42,6 +37,7 @@ if ActiveRecord::Base.connection.supports_extensions?
 
     teardown do
       @connection.drop_table "hstores", if_exists: true
+      disable_extension!("hstore", @connection)
     end
 
     def test_hstore_included_in_extensions