2 files changed, 15 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index c9982d3705..1f35300739 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -10,6 +10,12 @@ if ActiveRecord::Base.connection.supports_extensions?
       store_accessor :settings, :language, :timezone
     end
 
+    class FakeParameters
+      def to_unsafe_h
+        { "hi" => "hi" }
+      end
+    end
+
     def setup
       @connection = ActiveRecord::Base.connection
 
@@ -321,6 +327,10 @@ if ActiveRecord::Base.connection.supports_extensions?
       assert_match %r[t\.hstore "tags",\s+default: {}], output
     end
 
+    def test_supports_to_unsafe_h_values
+      assert_equal("\"hi\"=>\"hi\"", @type.serialize(FakeParameters.new))
+    end
+
     private
       def assert_array_cycle(array)
         # test creation
diff --git a/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb b/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
index b898929f8a..181c1a097c 100644
--- a/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
@@ -1,19 +1,20 @@
 require "cases/helper"
+require "models/computer"
 require "models/developer"
 
 class PreparedStatementsTest < ActiveRecord::PostgreSQLTestCase
   fixtures :developers
 
   def setup
-    @default_prepared_statements = Developer.connection_config[:prepared_statements]
-    Developer.connection_config[:prepared_statements] = false
+    @default_prepared_statements = ActiveRecord::Base.connection.instance_variable_get("@prepared_statements")
+    ActiveRecord::Base.connection.instance_variable_set("@prepared_statements", false)
   end
 
   def teardown
-    Developer.connection_config[:prepared_statements] = @default_prepared_statements
+    ActiveRecord::Base.connection.instance_variable_set("@prepared_statements", @default_prepared_statements)
   end
 
-  def nothing_raised_with_falsy_prepared_statements
+  def test_nothing_raised_with_falsy_prepared_statements
     assert_nothing_raised do
       Developer.where(id: 1)
     end