diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index a51d5e9d310a8ec250b67004204b11177043530e..70585e014821489917fdb047d49261cc2c6775e2 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -192,16 +192,6 @@ def test_attribute_for_inspect_for_array_field
     assert_equal("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...]", record.attribute_for_inspect(:ratings))
   end
 
-  def test_update_all
-    pg_array = PgArray.create! tags: ["one", "two", "three"]
-
-    PgArray.update_all tags: ["four", "five"]
-    assert_equal ["four", "five"], pg_array.reload.tags
-
-    PgArray.update_all tags: []
-    assert_equal [], pg_array.reload.tags
-  end
-
   def test_escaping
     unknown = 'foo\\",bar,baz,\\'
     tags = ["hello_#{unknown}"]
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 06788df4e15ee8df01c78f08d63205c476657740..8f78dbecf556d45223f7212b7cf73b2fbf0112d3 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -295,16 +295,6 @@ def test_multiline
       assert_cycle("a\nb" => "c\nd")
     end
 
-    def test_update_all
-      hstore = Hstore.create! tags: { "one" => "two" }
-
-      Hstore.update_all tags: { "three" => "four" }
-      assert_equal({ "three" => "four" }, hstore.reload.tags)
-
-      Hstore.update_all tags: { }
-      assert_equal({ }, hstore.reload.tags)
-    end
-
     class TagCollection
       def initialize(hash); @hash = hash end
       def to_hash; @hash end
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 4cdb4a48932d9461c2fe2e6306b9ae0f60c264e3..e44afea33af4cd10a172231b7394ff9216c7029d 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -155,16 +155,6 @@ def test_yaml_round_trip_with_store_accessors
     assert_equal "320×480", y.resolution
   end
 
-  def test_update_all
-    json = JsonDataType.create! payload: { "one" => "two" }
-
-    JsonDataType.update_all payload: { "three" => "four" }
-    assert_equal({ "three" => "four" }, json.reload.payload)
-
-    JsonDataType.update_all payload: { }
-    assert_equal({ }, json.reload.payload)
-  end
-
   def test_changes_in_place
     json = JsonDataType.new
     assert_not json.changed?
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index fb0b906c07822a1ebf621025a95d6dd912b1b607..3280945d092a2f1f831c1150dfbaaf0f70a7af43 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -235,5 +235,33 @@ def test_relation_merging_with_merged_joins_as_strings
       posts_with_special_comments_with_ratings = Post.group("posts.id").joins(:special_comments).merge(special_comments_with_ratings)
       assert_equal 3, authors(:david).posts.merge(posts_with_special_comments_with_ratings).count.length
     end
+
+    class EnsureRoundTripTypeCasting < ActiveRecord::Type::Value
+      def type
+        :string
+      end
+
+      def type_cast_from_database(value)
+        raise value unless value == "type cast for database"
+        "type cast from database"
+      end
+
+      def type_cast_for_database(value)
+        raise value unless value == "value from user"
+        "type cast for database"
+      end
+    end
+
+    class UpdateAllTestModel < ActiveRecord::Base
+      self.table_name = 'posts'
+
+      attribute :body, EnsureRoundTripTypeCasting.new
+    end
+
+    def test_update_all_goes_through_normal_type_casting
+      UpdateAllTestModel.update_all(body: "value from user", type: nil) # No STI
+
+      assert_equal "type cast from database", UpdateAllTestModel.first.body
+    end
   end
 end