diff --git a/activesupport/test/testing/setup_and_teardown_test.rb b/activesupport/test/testing/after_teardown_test.rb
similarity index 93%
rename from activesupport/test/testing/setup_and_teardown_test.rb
rename to activesupport/test/testing/after_teardown_test.rb
index 283f82d19a..68c368909c 100644
--- a/activesupport/test/testing/setup_and_teardown_test.rb
+++ b/activesupport/test/testing/after_teardown_test.rb
@@ -8,7 +8,7 @@ module OtherAfterTeardown
   end
 end
 
-class SetupAndTeardownTest < Minitest::Test
+class AfterTeardownTest < Minitest::Test
   include OtherAfterTeardown
   include ActiveSupport::Testing::SetupAndTeardown