diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 9498c829dc971890bec1b5fe74e3c6387a37a171..331e3f7e4d1a6bbe7645028becff55fefb9162bf 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -11,11 +11,18 @@ class Hstore < ActiveRecord::Base
 
   def setup
     @connection = ActiveRecord::Base.connection
+
+    unless @connection.supports_extensions?
+      return skip "do not test on PG without hstore"
+    end
+
     unless @connection.extension_enabled?('hstore')
       @connection.enable_extension 'hstore'
-      return skip "do not test on PG without hstore"
+      @connection.commit_db_transaction
     end
 
+    @connection.reconnect!
+
     @connection.transaction do
       @connection.create_table('hstores') do |t|
         t.hstore 'tags', :default => ''