Revert "No such class since 8d2866bb80fbe81acb04f5b0c44f152f571fb29f"

This reverts commit dd779c9686f49f5ed6dda8ad5a1cb3b0788e1dd4.

50 files changed, 57 insertions, 57 deletions

diff --git a/activemodel/test/cases/attribute_assignment_test.rb b/activemodel/test/cases/attribute_assignment_test.rb
index 36e279f06b..30e8419685 100644
--- a/activemodel/test/cases/attribute_assignment_test.rb
+++ b/activemodel/test/cases/attribute_assignment_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/hash_with_indifferent_access"
 
-class AttributeAssignmentTest < ActiveSupport::TestCase
+class AttributeAssignmentTest < ActiveModel::TestCase
   class Model
     include ActiveModel::AttributeAssignment
 
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 09161dd719..e3b3b15f25 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -94,7 +94,7 @@ class ModelWithoutAttributesMethod
   include ActiveModel::AttributeMethods
 end
 
-class AttributeMethodsTest < ActiveSupport::TestCase
+class AttributeMethodsTest < ActiveModel::TestCase
   test "method missing works correctly even if attributes method is not defined" do
     assert_raises(NoMethodError) { ModelWithoutAttributesMethod.new.foo }
   end
diff --git a/activemodel/test/cases/attribute_set_test.rb b/activemodel/test/cases/attribute_set_test.rb
index d1f0cd36a7..62feb9074e 100644
--- a/activemodel/test/cases/attribute_set_test.rb
+++ b/activemodel/test/cases/attribute_set_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require "active_model/attribute_set"
 
 module ActiveModel
-  class AttributeSetTest < ActiveSupport::TestCase
+  class AttributeSetTest < ActiveModel::TestCase
     test "building a new set from raw attributes" do
       builder = AttributeSet::Builder.new(foo: Type::Integer.new, bar: Type::Float.new)
       attributes = builder.build_from_database(foo: "1.1", bar: "2.2")
diff --git a/activemodel/test/cases/attribute_test.rb b/activemodel/test/cases/attribute_test.rb
index e11783e492..097db2e923 100644
--- a/activemodel/test/cases/attribute_test.rb
+++ b/activemodel/test/cases/attribute_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 
 module ActiveModel
-  class AttributeTest < ActiveSupport::TestCase
+  class AttributeTest < ActiveModel::TestCase
     setup do
       @type = Minitest::Mock.new
     end
diff --git a/activemodel/test/cases/attributes_dirty_test.rb b/activemodel/test/cases/attributes_dirty_test.rb
index 58244e7b79..f9693a23cd 100644
--- a/activemodel/test/cases/attributes_dirty_test.rb
+++ b/activemodel/test/cases/attributes_dirty_test.rb
@@ -2,7 +2,7 @@
 
 require "cases/helper"
 
-class AttributesDirtyTest < ActiveSupport::TestCase
+class AttributesDirtyTest < ActiveModel::TestCase
   class DirtyModel
     include ActiveModel::Model
     include ActiveModel::Attributes
diff --git a/activemodel/test/cases/attributes_test.rb b/activemodel/test/cases/attributes_test.rb
index 335f151e31..af0ddcb92f 100644
--- a/activemodel/test/cases/attributes_test.rb
+++ b/activemodel/test/cases/attributes_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 
 module ActiveModel
-  class AttributesTest < ActiveSupport::TestCase
+  class AttributesTest < ActiveModel::TestCase
     class ModelForAttributesTest
       include ActiveModel::Model
       include ActiveModel::Attributes
diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
index d38f773afd..0711dc56ca 100644
--- a/activemodel/test/cases/callbacks_test.rb
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -2,7 +2,7 @@
 
 require "cases/helper"
 
-class CallbacksTest < ActiveSupport::TestCase
+class CallbacksTest < ActiveModel::TestCase
   class CallbackValidator
     def around_create(model)
       model.callbacks << :before_around_create
diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index e46a2ac622..347896ed50 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require "models/contact"
 require "models/helicopter"
 
-class ConversionTest < ActiveSupport::TestCase
+class ConversionTest < ActiveModel::TestCase
   test "to_model default implementation returns self" do
     contact = Contact.new
     assert_equal contact, contact.to_model
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 44f11751a0..0edbbffa86 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -2,7 +2,7 @@
 
 require "cases/helper"
 
-class DirtyTest < ActiveSupport::TestCase
+class DirtyTest < ActiveModel::TestCase
   class DirtyModel
     include ActiveModel::Dirty
     define_attribute_methods :name, :color, :size, :status
diff --git a/activemodel/test/cases/error_test.rb b/activemodel/test/cases/error_test.rb
index fad85cbb80..d74321fee5 100644
--- a/activemodel/test/cases/error_test.rb
+++ b/activemodel/test/cases/error_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 require "active_model/error"
 
-class ErrorTest < ActiveSupport::TestCase
+class ErrorTest < ActiveModel::TestCase
   class Person
     extend ActiveModel::Naming
     def initialize
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 62b14df4a4..a6cd1da717 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 require "yaml"
 
-class ErrorsTest < ActiveSupport::TestCase
+class ErrorsTest < ActiveModel::TestCase
   class Person
     extend ActiveModel::Naming
     def initialize
diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb
index 4b1e32d506..d62c80b71a 100644
--- a/activemodel/test/cases/lint_test.rb
+++ b/activemodel/test/cases/lint_test.rb
@@ -2,7 +2,7 @@
 
 require "cases/helper"
 
-class LintTest < ActiveSupport::TestCase
+class LintTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
   class CompliantModel
diff --git a/activemodel/test/cases/model_test.rb b/activemodel/test/cases/model_test.rb
index c8f598306e..b24d7e3571 100644
--- a/activemodel/test/cases/model_test.rb
+++ b/activemodel/test/cases/model_test.rb
@@ -2,7 +2,7 @@
 
 require "cases/helper"
 
-class ModelTest < ActiveSupport::TestCase
+class ModelTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
   module DefaultValue
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index d1f5bc2b82..4693da434c 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -6,7 +6,7 @@ require "models/sheep"
 require "models/track_back"
 require "models/blog_post"
 
-class NamingTest < ActiveSupport::TestCase
+class NamingTest < ActiveModel::TestCase
   def setup
     @model_name = ActiveModel::Name.new(Post::TrackBack)
   end
@@ -44,7 +44,7 @@ class NamingTest < ActiveSupport::TestCase
   end
 end
 
-class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveSupport::TestCase
+class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
   def setup
     @model_name = ActiveModel::Name.new(Blog::Post, Blog)
   end
@@ -82,7 +82,7 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveSupport::TestCase
   end
 end
 
-class NamingWithNamespacedModelInSharedNamespaceTest < ActiveSupport::TestCase
+class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase
   def setup
     @model_name = ActiveModel::Name.new(Blog::Post)
   end
@@ -120,7 +120,7 @@ class NamingWithNamespacedModelInSharedNamespaceTest < ActiveSupport::TestCase
   end
 end
 
-class NamingWithSuppliedModelNameTest < ActiveSupport::TestCase
+class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
   def setup
     @model_name = ActiveModel::Name.new(Blog::Post, nil, "Article")
   end
@@ -158,7 +158,7 @@ class NamingWithSuppliedModelNameTest < ActiveSupport::TestCase
   end
 end
 
-class NamingUsingRelativeModelNameTest < ActiveSupport::TestCase
+class NamingUsingRelativeModelNameTest < ActiveModel::TestCase
   def setup
     @model_name = Blog::Post.model_name
   end
@@ -196,7 +196,7 @@ class NamingUsingRelativeModelNameTest < ActiveSupport::TestCase
   end
 end
 
-class NamingHelpersTest < ActiveSupport::TestCase
+class NamingHelpersTest < ActiveModel::TestCase
   def setup
     @klass  = Contact
     @record = @klass.new
@@ -262,7 +262,7 @@ class NamingHelpersTest < ActiveSupport::TestCase
     end
 end
 
-class NameWithAnonymousClassTest < ActiveSupport::TestCase
+class NameWithAnonymousClassTest < ActiveModel::TestCase
   def test_anonymous_class_without_name_argument
     assert_raises(ArgumentError) do
       ActiveModel::Name.new(Class.new)
@@ -275,7 +275,7 @@ class NameWithAnonymousClassTest < ActiveSupport::TestCase
   end
 end
 
-class NamingMethodDelegationTest < ActiveSupport::TestCase
+class NamingMethodDelegationTest < ActiveModel::TestCase
   def test_model_name
     assert_equal Blog::Post.model_name, Blog::Post.new.model_name
   end
diff --git a/activemodel/test/cases/nested_error_test.rb b/activemodel/test/cases/nested_error_test.rb
index c53355baff..6c2458ba83 100644
--- a/activemodel/test/cases/nested_error_test.rb
+++ b/activemodel/test/cases/nested_error_test.rb
@@ -5,7 +5,7 @@ require "active_model/nested_error"
 require "models/topic"
 require "models/reply"
 
-class NestedErrorTest < ActiveSupport::TestCase
+class NestedErrorTest < ActiveModel::TestCase
   def test_initialize
     topic = Topic.new
     inner_error = ActiveModel::Error.new(topic, :title, :not_enough, count: 2)
diff --git a/activemodel/test/cases/railtie_test.rb b/activemodel/test/cases/railtie_test.rb
index 53f326a36b..f5ff1a3fd7 100644
--- a/activemodel/test/cases/railtie_test.rb
+++ b/activemodel/test/cases/railtie_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 require "active_support/testing/isolation"
 
-class RailtieTest < ActiveSupport::TestCase
+class RailtieTest < ActiveModel::TestCase
   include ActiveSupport::Testing::Isolation
 
   def setup
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 9ce9f696f0..0aca714bd2 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require "models/user"
 require "models/visitor"
 
-class SecurePasswordTest < ActiveSupport::TestCase
+class SecurePasswordTest < ActiveModel::TestCase
   setup do
     # Used only to speed up tests
     @original_min_cost = ActiveModel::SecurePassword.min_cost
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb
index c2484aaa37..6826d2bbd1 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 require "active_support/core_ext/object/instance_variables"
 
-class SerializationTest < ActiveSupport::TestCase
+class SerializationTest < ActiveModel::TestCase
   class User
     include ActiveModel::Serialization
 
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index 871eab36e2..84efc8de0d 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require "models/contact"
 require "active_support/core_ext/object/instance_variables"
 
-class JsonSerializationTest < ActiveSupport::TestCase
+class JsonSerializationTest < ActiveModel::TestCase
   def setup
     @contact = Contact.new
     @contact.name = "Konata Izumi"
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index 1cc7246477..cd75afec9e 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 require "models/person"
 
-class ActiveModelI18nTests < ActiveSupport::TestCase
+class ActiveModelI18nTests < ActiveModel::TestCase
   def setup
     I18n.backend = I18n::Backend::Simple.new
   end
diff --git a/activemodel/test/cases/type/big_integer_test.rb b/activemodel/test/cases/type/big_integer_test.rb
index 1ab0abe9ce..0fa0200df4 100644
--- a/activemodel/test/cases/type/big_integer_test.rb
+++ b/activemodel/test/cases/type/big_integer_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class BigIntegerTest < ActiveSupport::TestCase
+    class BigIntegerTest < ActiveModel::TestCase
       def test_type_cast_big_integer
         type = Type::BigInteger.new
         assert_equal 1, type.cast(1)
diff --git a/activemodel/test/cases/type/binary_test.rb b/activemodel/test/cases/type/binary_test.rb
index b04b59f8dd..3221a73e49 100644
--- a/activemodel/test/cases/type/binary_test.rb
+++ b/activemodel/test/cases/type/binary_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class BinaryTest < ActiveSupport::TestCase
+    class BinaryTest < ActiveModel::TestCase
       def test_type_cast_binary
         type = Type::Binary.new
         assert_nil type.cast(nil)
diff --git a/activemodel/test/cases/type/boolean_test.rb b/activemodel/test/cases/type/boolean_test.rb
index 30c41ca80c..7f8490b2fe 100644
--- a/activemodel/test/cases/type/boolean_test.rb
+++ b/activemodel/test/cases/type/boolean_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class BooleanTest < ActiveSupport::TestCase
+    class BooleanTest < ActiveModel::TestCase
       def test_type_cast_boolean
         type = Type::Boolean.new
         assert_predicate type.cast(""), :nil?
diff --git a/activemodel/test/cases/type/date_test.rb b/activemodel/test/cases/type/date_test.rb
index 38649c4471..2dd1a55616 100644
--- a/activemodel/test/cases/type/date_test.rb
+++ b/activemodel/test/cases/type/date_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class DateTest < ActiveSupport::TestCase
+    class DateTest < ActiveModel::TestCase
       def test_type_cast_date
         type = Type::Date.new
         assert_nil type.cast(nil)
diff --git a/activemodel/test/cases/type/date_time_test.rb b/activemodel/test/cases/type/date_time_test.rb
index 68dd4995d0..4a63eee0cf 100644
--- a/activemodel/test/cases/type/date_time_test.rb
+++ b/activemodel/test/cases/type/date_time_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class DateTimeTest < ActiveSupport::TestCase
+    class DateTimeTest < ActiveModel::TestCase
       def test_type_cast_datetime_and_timestamp
         type = Type::DateTime.new
         assert_nil type.cast(nil)
diff --git a/activemodel/test/cases/type/decimal_test.rb b/activemodel/test/cases/type/decimal_test.rb
index af89ef309b..be60c4f7fa 100644
--- a/activemodel/test/cases/type/decimal_test.rb
+++ b/activemodel/test/cases/type/decimal_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class DecimalTest < ActiveSupport::TestCase
+    class DecimalTest < ActiveModel::TestCase
       def test_type_cast_decimal
         type = Decimal.new
         assert_equal BigDecimal("0"), type.cast(BigDecimal("0"))
diff --git a/activemodel/test/cases/type/float_test.rb b/activemodel/test/cases/type/float_test.rb
index 2b2c99b8ce..230a8dda32 100644
--- a/activemodel/test/cases/type/float_test.rb
+++ b/activemodel/test/cases/type/float_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class FloatTest < ActiveSupport::TestCase
+    class FloatTest < ActiveModel::TestCase
       def test_type_cast_float
         type = Type::Float.new
         assert_equal 1.0, type.cast("1")
diff --git a/activemodel/test/cases/type/immutable_string_test.rb b/activemodel/test/cases/type/immutable_string_test.rb
index b3140c2682..751f753ddb 100644
--- a/activemodel/test/cases/type/immutable_string_test.rb
+++ b/activemodel/test/cases/type/immutable_string_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class ImmutableStringTest < ActiveSupport::TestCase
+    class ImmutableStringTest < ActiveModel::TestCase
       test "cast strings are frozen" do
         s = "foo"
         type = Type::ImmutableString.new
diff --git a/activemodel/test/cases/type/integer_test.rb b/activemodel/test/cases/type/integer_test.rb
index 79bd7ee95d..6c02c01237 100644
--- a/activemodel/test/cases/type/integer_test.rb
+++ b/activemodel/test/cases/type/integer_test.rb
@@ -5,7 +5,7 @@ require "active_support/core_ext/numeric/time"
 
 module ActiveModel
   module Type
-    class IntegerTest < ActiveSupport::TestCase
+    class IntegerTest < ActiveModel::TestCase
       test "simple values" do
         type = Type::Integer.new
         assert_nil type.cast("")
diff --git a/activemodel/test/cases/type/registry_test.rb b/activemodel/test/cases/type/registry_test.rb
index 2afc54f1f5..0633ea2538 100644
--- a/activemodel/test/cases/type/registry_test.rb
+++ b/activemodel/test/cases/type/registry_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class RegistryTest < ActiveSupport::TestCase
+    class RegistryTest < ActiveModel::TestCase
       test "a class can be registered for a symbol" do
         registry = Type::Registry.new
         registry.register(:foo, ::String)
diff --git a/activemodel/test/cases/type/string_test.rb b/activemodel/test/cases/type/string_test.rb
index 999368fd13..9cc530e8db 100644
--- a/activemodel/test/cases/type/string_test.rb
+++ b/activemodel/test/cases/type/string_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class StringTest < ActiveSupport::TestCase
+    class StringTest < ActiveModel::TestCase
       test "type casting" do
         type = Type::String.new
         assert_equal "t", type.cast(true)
diff --git a/activemodel/test/cases/type/time_test.rb b/activemodel/test/cases/type/time_test.rb
index 095dbd6d83..5c6271241d 100644
--- a/activemodel/test/cases/type/time_test.rb
+++ b/activemodel/test/cases/type/time_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class TimeTest < ActiveSupport::TestCase
+    class TimeTest < ActiveModel::TestCase
       def test_type_cast_time
         type = Type::Time.new
         assert_nil type.cast(nil)
diff --git a/activemodel/test/cases/type/value_test.rb b/activemodel/test/cases/type/value_test.rb
index 6edacb9833..55b5d9d584 100644
--- a/activemodel/test/cases/type/value_test.rb
+++ b/activemodel/test/cases/type/value_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 module ActiveModel
   module Type
-    class ValueTest < ActiveSupport::TestCase
+    class ValueTest < ActiveModel::TestCase
       def test_type_equality
         assert_equal Type::Value.new, Type::Value.new
         assert_not_equal Type::Value.new, Type::Integer.new
diff --git a/activemodel/test/cases/validations/absence_validation_test.rb b/activemodel/test/cases/validations/absence_validation_test.rb
index 1701acd568..8bc4f4723a 100644
--- a/activemodel/test/cases/validations/absence_validation_test.rb
+++ b/activemodel/test/cases/validations/absence_validation_test.rb
@@ -5,7 +5,7 @@ require "models/topic"
 require "models/person"
 require "models/custom_reader"
 
-class AbsenceValidationTest < ActiveSupport::TestCase
+class AbsenceValidationTest < ActiveModel::TestCase
   teardown do
     Topic.clear_validators!
     Person.clear_validators!
diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 3cdebec1ac..6bd3d292f8 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -6,7 +6,7 @@ require "models/topic"
 require "models/reply"
 require "models/person"
 
-class AcceptanceValidationTest < ActiveSupport::TestCase
+class AcceptanceValidationTest < ActiveModel::TestCase
   teardown do
     self.class.send(:remove_const, :TestClass)
   end
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 65b5ee1e57..ff3cf61746 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -85,7 +85,7 @@ class DogValidatorWithIfCondition < Dog
   def set_after_validation_marker2; history << "after_validation_marker2" ; end
 end
 
-class CallbacksWithMethodNamesShouldBeCalled < ActiveSupport::TestCase
+class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
   def test_if_condition_is_respected_for_before_validation
     d = DogValidatorWithIfCondition.new
     d.valid?
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index e82aa2eacb..9674068aff 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 require "models/topic"
 
-class ConditionalValidationTest < ActiveSupport::TestCase
+class ConditionalValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index 9a289e77ea..7bf15e4bee 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -5,7 +5,7 @@ require "cases/helper"
 require "models/topic"
 require "models/person"
 
-class ConfirmationValidationTest < ActiveSupport::TestCase
+class ConfirmationValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 389195a8ad..50bd47065c 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -6,7 +6,7 @@ require "active_support/core_ext/numeric/time"
 require "models/topic"
 require "models/person"
 
-class ExclusionValidationTest < ActiveSupport::TestCase
+class ExclusionValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index feae66602c..2a7088b3e8 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -5,7 +5,7 @@ require "cases/helper"
 require "models/topic"
 require "models/person"
 
-class FormatValidationTest < ActiveSupport::TestCase
+class FormatValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
index e9adc7d446..d3e44945db 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 require "models/person"
 
-class I18nGenerateMessageValidationTest < ActiveSupport::TestCase
+class I18nGenerateMessageValidationTest < ActiveModel::TestCase
   def setup
     Person.clear_validators!
     @person = Person.new
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index aaa3e4909d..c81649f493 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -3,7 +3,7 @@
 require "cases/helper"
 require "models/person"
 
-class I18nValidationTest < ActiveSupport::TestCase
+class I18nValidationTest < ActiveModel::TestCase
   def setup
     Person.clear_validators!
     @person = person_class.new
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 3469dd5e9d..6669d028a0 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -5,7 +5,7 @@ require "cases/helper"
 require "models/topic"
 require "models/person"
 
-class InclusionValidationTest < ActiveSupport::TestCase
+class InclusionValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb
index 7d59b9a035..37e10f783c 100644
--- a/activemodel/test/cases/validations/length_validation_test.rb
+++ b/activemodel/test/cases/validations/length_validation_test.rb
@@ -5,7 +5,7 @@ require "cases/helper"
 require "models/topic"
 require "models/person"
 
-class LengthValidationTest < ActiveSupport::TestCase
+class LengthValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index c8afc02894..191af033df 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -8,7 +8,7 @@ require "models/person"
 require "bigdecimal"
 require "active_support/core_ext/big_decimal"
 
-class NumericalityValidationTest < ActiveSupport::TestCase
+class NumericalityValidationTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index ca91b49528..c3eca41070 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -6,7 +6,7 @@ require "models/topic"
 require "models/person"
 require "models/custom_reader"
 
-class PresenceValidationTest < ActiveSupport::TestCase
+class PresenceValidationTest < ActiveModel::TestCase
   teardown do
     Topic.clear_validators!
     Person.clear_validators!
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index 090274c0b5..ae5a875c24 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -6,7 +6,7 @@ require "models/topic"
 require "models/person_with_validator"
 require "validators/namespace/email_validator"
 
-class ValidatesTest < ActiveSupport::TestCase
+class ValidatesTest < ActiveModel::TestCase
   setup :reset_callbacks
   teardown :reset_callbacks
 
diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb
index 0f5aee0751..3d2dea9828 100644
--- a/activemodel/test/cases/validations/validations_context_test.rb
+++ b/activemodel/test/cases/validations/validations_context_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 require "models/topic"
 
-class ValidationsContextTest < ActiveSupport::TestCase
+class ValidationsContextTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 6d00ece108..e6ae6603f2 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 
 require "models/topic"
 
-class ValidatesWithTest < ActiveSupport::TestCase
+class ValidatesWithTest < ActiveModel::TestCase
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 6565560e29..0b9e1b7005 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -9,7 +9,7 @@ require "models/custom_reader"
 require "active_support/json"
 require "active_support/xml_mini"
 
-class ValidationsTest < ActiveSupport::TestCase
+class ValidationsTest < ActiveModel::TestCase
   class CustomStrictValidationException < StandardError; end
 
   def teardown