diff --git a/Rakefile b/Rakefile
index 5977d0adec..17f5b9061b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -38,13 +38,13 @@ end
 Rake::TestTask.new(:normal_test) do |t|
   t.verbose = true
   t.deps = :generate
-  t.test_files = FileList["test/**/test_*.rb"].exclude("test/rdoc/test_rdoc_rubygems_hook.rb")
+  t.test_files = FileList["test/**/*_test.rb"].exclude("test/rdoc/rdoc_rubygems_hook_test.rb")
 end
 
 Rake::TestTask.new(:rubygems_test) do |t|
   t.verbose = true
   t.deps = :generate
-  t.pattern = "test/rdoc/test_rdoc_rubygems_hook.rb"
+  t.pattern = "test/rdoc/rdoc_rubygems_hook_test.rb"
 end
 
 path = "pkg/#{Bundler::GemHelper.gemspec.full_name}"
diff --git a/test/rdoc/test_rdoc_alias.rb b/test/rdoc/rdoc_alias_test.rb
similarity index 86%
rename from test/rdoc/test_rdoc_alias.rb
rename to test/rdoc/rdoc_alias_test.rb
index 3c096a49b4..827002e729 100644
--- a/test/rdoc/test_rdoc_alias.rb
+++ b/test/rdoc/rdoc_alias_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocAlias < XrefTestCase
+class RDocAliasTest < XrefTestCase
 
   def test_to_s
     a = RDoc::Alias.new nil, 'a', 'b', ''
diff --git a/test/rdoc/test_rdoc_any_method.rb b/test/rdoc/rdoc_any_method_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_any_method.rb
rename to test/rdoc/rdoc_any_method_test.rb
index 2d9c725ea5..e963a3a345 100644
--- a/test/rdoc/test_rdoc_any_method.rb
+++ b/test/rdoc/rdoc_any_method_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocAnyMethod < XrefTestCase
+class RDocAnyMethodTest < XrefTestCase
 
   def test_aref
     m = RDoc::AnyMethod.new nil, 'method?'
diff --git a/test/rdoc/test_rdoc_attr.rb b/test/rdoc/rdoc_attr_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_attr.rb
rename to test/rdoc/rdoc_attr_test.rb
index 98c6e6af4b..fcdbdfd422 100644
--- a/test/rdoc/test_rdoc_attr.rb
+++ b/test/rdoc/rdoc_attr_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocAttr < RDoc::TestCase
+class RDocAttrTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_class_module.rb b/test/rdoc/rdoc_class_module_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_class_module.rb
rename to test/rdoc/rdoc_class_module_test.rb
diff --git a/test/rdoc/test_rdoc_code_object.rb b/test/rdoc/rdoc_code_object_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_code_object.rb
rename to test/rdoc/rdoc_code_object_test.rb
index 429def790b..af5c34257c 100644
--- a/test/rdoc/test_rdoc_code_object.rb
+++ b/test/rdoc/rdoc_code_object_test.rb
@@ -3,7 +3,7 @@
 
 require_relative 'xref_test_case'
 
-class TestRDocCodeObject < XrefTestCase
+class RDocCodeObjectTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_comment.rb b/test/rdoc/rdoc_comment_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_comment.rb
rename to test/rdoc/rdoc_comment_test.rb
diff --git a/test/rdoc/test_rdoc_constant.rb b/test/rdoc/rdoc_constant_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_constant.rb
rename to test/rdoc/rdoc_constant_test.rb
index f1930fbc62..f9f795101c 100644
--- a/test/rdoc/test_rdoc_constant.rb
+++ b/test/rdoc/rdoc_constant_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocConstant < XrefTestCase
+class RDocConstantTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_context_section.rb b/test/rdoc/rdoc_context_section_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_context_section.rb
rename to test/rdoc/rdoc_context_section_test.rb
index 76f2a832ed..179ea95014 100644
--- a/test/rdoc/test_rdoc_context_section.rb
+++ b/test/rdoc/rdoc_context_section_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocContextSection < RDoc::TestCase
+class RDocContextSectionTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_context.rb b/test/rdoc/rdoc_context_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_context.rb
rename to test/rdoc/rdoc_context_test.rb
index 9564ab6636..eaa4f23621 100644
--- a/test/rdoc/test_rdoc_context.rb
+++ b/test/rdoc/rdoc_context_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocContext < XrefTestCase
+class RDocContextTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_cross_reference.rb b/test/rdoc/rdoc_cross_reference_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_cross_reference.rb
rename to test/rdoc/rdoc_cross_reference_test.rb
index 2e385d53c5..4f24fd7700 100644
--- a/test/rdoc/test_rdoc_cross_reference.rb
+++ b/test/rdoc/rdoc_cross_reference_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocCrossReference < XrefTestCase
+class RDocCrossReferenceTest < XrefTestCase
   EXAMPLE_METHODS = %w'== === != =~ !~ < > <= >= <=> [] []= << >>
     -@ +@ ! - + * / % ** !@ ` | & ^ ~ __id__
   '
diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/rdoc_encoding_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_encoding.rb
rename to test/rdoc/rdoc_encoding_test.rb
index 58536b035e..fdb42afd7f 100644
--- a/test/rdoc/test_rdoc_encoding.rb
+++ b/test/rdoc/rdoc_encoding_test.rb
@@ -3,7 +3,7 @@
 
 require_relative 'helper'
 
-class TestRDocEncoding < RDoc::TestCase
+class RDocEncodingTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_extend.rb b/test/rdoc/rdoc_extend_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_extend.rb
rename to test/rdoc/rdoc_extend_test.rb
index cc5038cc51..cf13eba0c5 100644
--- a/test/rdoc/test_rdoc_extend.rb
+++ b/test/rdoc/rdoc_extend_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocExtend < XrefTestCase
+class RDocExtendTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/rdoc_generator_darkfish_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_generator_darkfish.rb
rename to test/rdoc/rdoc_generator_darkfish_test.rb
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/rdoc_generator_json_index_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_generator_json_index.rb
rename to test/rdoc/rdoc_generator_json_index_test.rb
index 8a50deab89..aa7a2da0b1 100644
--- a/test/rdoc/test_rdoc_generator_json_index.rb
+++ b/test/rdoc/rdoc_generator_json_index_test.rb
@@ -3,7 +3,7 @@
 
 require_relative 'helper'
 
-class TestRDocGeneratorJsonIndex < RDoc::TestCase
+class RDocGeneratorJsonIndexTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_generator_markup.rb b/test/rdoc/rdoc_generator_markup_test.rb
similarity index 96%
rename from test/rdoc/test_rdoc_generator_markup.rb
rename to test/rdoc/rdoc_generator_markup_test.rb
index 888fb76e3f..cd77e67e79 100644
--- a/test/rdoc/test_rdoc_generator_markup.rb
+++ b/test/rdoc/rdoc_generator_markup_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocGeneratorMarkup < RDoc::TestCase
+class RDocGeneratorMarkupTest < RDoc::TestCase
 
   include RDoc::Text
   include RDoc::Generator::Markup
diff --git a/test/rdoc/test_rdoc_generator_pot_po_entry.rb b/test/rdoc/rdoc_generator_pot_po_entry_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_generator_pot_po_entry.rb
rename to test/rdoc/rdoc_generator_pot_po_entry_test.rb
index d3d6271b23..d058ff3f40 100644
--- a/test/rdoc/test_rdoc_generator_pot_po_entry.rb
+++ b/test/rdoc/rdoc_generator_pot_po_entry_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocGeneratorPOTPOEntry < RDoc::TestCase
+class RDocGeneratorPOTPOEntryTest < RDoc::TestCase
 
   def test_msgid_normal
     assert_equal <<-'ENTRY', entry("Hello", {}).to_s
diff --git a/test/rdoc/test_rdoc_generator_pot_po.rb b/test/rdoc/rdoc_generator_pot_po_test.rb
similarity index 95%
rename from test/rdoc/test_rdoc_generator_pot_po.rb
rename to test/rdoc/rdoc_generator_pot_po_test.rb
index 7696a1f5b1..83b4a5f1c3 100644
--- a/test/rdoc/test_rdoc_generator_pot_po.rb
+++ b/test/rdoc/rdoc_generator_pot_po_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocGeneratorPOTPO < RDoc::TestCase
+class RDocGeneratorPOTPOTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_generator_pot.rb b/test/rdoc/rdoc_generator_pot_test.rb
similarity index 97%
rename from test/rdoc/test_rdoc_generator_pot.rb
rename to test/rdoc/rdoc_generator_pot_test.rb
index bafe9ecca5..736f9765e5 100644
--- a/test/rdoc/test_rdoc_generator_pot.rb
+++ b/test/rdoc/rdoc_generator_pot_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocGeneratorPOT < RDoc::TestCase
+class RDocGeneratorPOTTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_generator_ri.rb b/test/rdoc/rdoc_generator_ri_test.rb
similarity index 97%
rename from test/rdoc/test_rdoc_generator_ri.rb
rename to test/rdoc/rdoc_generator_ri_test.rb
index d453631470..9109d22067 100644
--- a/test/rdoc/test_rdoc_generator_ri.rb
+++ b/test/rdoc/rdoc_generator_ri_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocGeneratorRI < RDoc::TestCase
+class RDocGeneratorRITest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_i18n_locale.rb b/test/rdoc/rdoc_i18n_locale_test.rb
similarity index 97%
rename from test/rdoc/test_rdoc_i18n_locale.rb
rename to test/rdoc/rdoc_i18n_locale_test.rb
index 746d659c67..cfbc7c5bb2 100644
--- a/test/rdoc/test_rdoc_i18n_locale.rb
+++ b/test/rdoc/rdoc_i18n_locale_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocI18nLocale < RDoc::TestCase
+class RDocI18nLocaleTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_i18n_text.rb b/test/rdoc/rdoc_i18n_text_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_i18n_text.rb
rename to test/rdoc/rdoc_i18n_text_test.rb
index 89b7e97708..888479d20d 100644
--- a/test/rdoc/test_rdoc_i18n_text.rb
+++ b/test/rdoc/rdoc_i18n_text_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocI18nText < RDoc::TestCase
+class RDocI18nTextTest < RDoc::TestCase
 
   def test_multiple_paragraphs
     paragraph1 = <<-PARAGRAPH.strip
diff --git a/test/rdoc/test_rdoc_include.rb b/test/rdoc/rdoc_include_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_include.rb
rename to test/rdoc/rdoc_include_test.rb
index 380464f6cc..6b78d2a749 100644
--- a/test/rdoc/test_rdoc_include.rb
+++ b/test/rdoc/rdoc_include_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocInclude < XrefTestCase
+class RDocIncludeTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markdown.rb b/test/rdoc/rdoc_markdown_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_markdown.rb
rename to test/rdoc/rdoc_markdown_test.rb
index e1f5db7a27..2764f94bec 100644
--- a/test/rdoc/test_rdoc_markdown.rb
+++ b/test/rdoc/rdoc_markdown_test.rb
@@ -5,7 +5,7 @@
 require_relative '../../lib/rdoc/markup/block_quote'
 require_relative '../../lib/rdoc/markdown'
 
-class TestRDocMarkdown < RDoc::TestCase
+class RDocMarkdownTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markdown_test.rb b/test/rdoc/rdoc_markdown_test_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_markdown_test.rb
rename to test/rdoc/rdoc_markdown_test_test.rb
index 193d648253..c28fe6bebd 100644
--- a/test/rdoc/test_rdoc_markdown_test.rb
+++ b/test/rdoc/rdoc_markdown_test_test.rb
@@ -5,7 +5,7 @@
 require_relative '../../lib/rdoc'
 require_relative '../../lib/rdoc/markdown'
 
-class TestRDocMarkdownTest < RDoc::TestCase
+class RDocMarkdownTestTest < RDoc::TestCase
 
   MARKDOWN_TEST_PATH = File.expand_path '../MarkdownTest_1.0.3/', __FILE__
 
diff --git a/test/rdoc/test_rdoc_markup_attribute_manager.rb b/test/rdoc/rdoc_markup_attribute_manager_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_markup_attribute_manager.rb
rename to test/rdoc/rdoc_markup_attribute_manager_test.rb
index af53b762c0..05bd951990 100644
--- a/test/rdoc/test_rdoc_markup_attribute_manager.rb
+++ b/test/rdoc/rdoc_markup_attribute_manager_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupAttributeManager < RDoc::TestCase
+class RDocMarkupAttributeManagerTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_attributes.rb b/test/rdoc/rdoc_markup_attributes_test.rb
similarity index 95%
rename from test/rdoc/test_rdoc_markup_attributes.rb
rename to test/rdoc/rdoc_markup_attributes_test.rb
index 1ab408d801..f584a4762a 100644
--- a/test/rdoc/test_rdoc_markup_attributes.rb
+++ b/test/rdoc/rdoc_markup_attributes_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupAttributes < RDoc::TestCase
+class RDocMarkupAttributesTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_document.rb b/test/rdoc/rdoc_markup_document_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_markup_document.rb
rename to test/rdoc/rdoc_markup_document_test.rb
index e4f3b9daf1..6b118f4e54 100644
--- a/test/rdoc/test_rdoc_markup_document.rb
+++ b/test/rdoc/rdoc_markup_document_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupDocument < RDoc::TestCase
+class RDocMarkupDocumentTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_formatter.rb b/test/rdoc/rdoc_markup_formatter_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_markup_formatter.rb
rename to test/rdoc/rdoc_markup_formatter_test.rb
index 77bd33e317..ee27f24e67 100644
--- a/test/rdoc/test_rdoc_markup_formatter.rb
+++ b/test/rdoc/rdoc_markup_formatter_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupFormatter < RDoc::TestCase
+class RDocMarkupFormatterTest < RDoc::TestCase
 
   class ToTest < RDoc::Markup::Formatter
 
diff --git a/test/rdoc/test_rdoc_markup_hard_break.rb b/test/rdoc/rdoc_markup_hard_break_test.rb
similarity index 90%
rename from test/rdoc/test_rdoc_markup_hard_break.rb
rename to test/rdoc/rdoc_markup_hard_break_test.rb
index ac67c68d10..8ec8ffcfed 100644
--- a/test/rdoc/test_rdoc_markup_hard_break.rb
+++ b/test/rdoc/rdoc_markup_hard_break_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupHardBreak < RDoc::TestCase
+class RDocMarkupHardBreakTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_heading.rb b/test/rdoc/rdoc_markup_heading_test.rb
similarity index 94%
rename from test/rdoc/test_rdoc_markup_heading.rb
rename to test/rdoc/rdoc_markup_heading_test.rb
index 5dd60ed3ab..3bf58ed5f7 100644
--- a/test/rdoc/test_rdoc_markup_heading.rb
+++ b/test/rdoc/rdoc_markup_heading_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupHeading < RDoc::TestCase
+class RDocMarkupHeadingTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_include.rb b/test/rdoc/rdoc_markup_include_test.rb
similarity index 89%
rename from test/rdoc/test_rdoc_markup_include.rb
rename to test/rdoc/rdoc_markup_include_test.rb
index b3e9b845c3..1544d25bee 100644
--- a/test/rdoc/test_rdoc_markup_include.rb
+++ b/test/rdoc/rdoc_markup_include_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupInclude < RDoc::TestCase
+class RDocMarkupIncludeTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_indented_paragraph.rb b/test/rdoc/rdoc_markup_indented_paragraph_test.rb
similarity index 94%
rename from test/rdoc/test_rdoc_markup_indented_paragraph.rb
rename to test/rdoc/rdoc_markup_indented_paragraph_test.rb
index d2a9cbe5ca..3be73b81db 100644
--- a/test/rdoc/test_rdoc_markup_indented_paragraph.rb
+++ b/test/rdoc/rdoc_markup_indented_paragraph_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupIndentedParagraph < RDoc::TestCase
+class RDocMarkupIndentedParagraphTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_paragraph.rb b/test/rdoc/rdoc_markup_paragraph_test.rb
similarity index 92%
rename from test/rdoc/test_rdoc_markup_paragraph.rb
rename to test/rdoc/rdoc_markup_paragraph_test.rb
index 1b26846eb3..0f1b96e123 100644
--- a/test/rdoc/test_rdoc_markup_paragraph.rb
+++ b/test/rdoc/rdoc_markup_paragraph_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupParagraph < RDoc::TestCase
+class RDocMarkupParagraphTest < RDoc::TestCase
 
   def test_accept
     visitor = Object.new
diff --git a/test/rdoc/test_rdoc_markup_parser.rb b/test/rdoc/rdoc_markup_parser_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_markup_parser.rb
rename to test/rdoc/rdoc_markup_parser_test.rb
index 6fccf09612..c157d9c213 100644
--- a/test/rdoc/test_rdoc_markup_parser.rb
+++ b/test/rdoc/rdoc_markup_parser_test.rb
@@ -3,7 +3,7 @@
 
 require_relative 'helper'
 
-class TestRDocMarkupParser < RDoc::TestCase
+class RDocMarkupParserTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_pre_process.rb b/test/rdoc/rdoc_markup_pre_process_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_pre_process.rb
rename to test/rdoc/rdoc_markup_pre_process_test.rb
diff --git a/test/rdoc/test_rdoc_markup_raw.rb b/test/rdoc/rdoc_markup_raw_test.rb
similarity index 87%
rename from test/rdoc/test_rdoc_markup_raw.rb
rename to test/rdoc/rdoc_markup_raw_test.rb
index 52887e6f6c..a1599ebb6c 100644
--- a/test/rdoc/test_rdoc_markup_raw.rb
+++ b/test/rdoc/rdoc_markup_raw_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupRaw < RDoc::TestCase
+class RDocMarkupRawTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup.rb b/test/rdoc/rdoc_markup_test.rb
similarity index 97%
rename from test/rdoc/test_rdoc_markup.rb
rename to test/rdoc/rdoc_markup_test.rb
index 4d79f8bc3f..d9d3d25e22 100644
--- a/test/rdoc/test_rdoc_markup.rb
+++ b/test/rdoc/rdoc_markup_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkup < RDoc::TestCase
+class RDocMarkupTest < RDoc::TestCase
 
   def test_class_parse
     expected = @RM::Document.new(
diff --git a/test/rdoc/test_rdoc_markup_to_ansi.rb b/test/rdoc/rdoc_markup_to_ansi_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_to_ansi.rb
rename to test/rdoc/rdoc_markup_to_ansi_test.rb
diff --git a/test/rdoc/test_rdoc_markup_to_bs.rb b/test/rdoc/rdoc_markup_to_bs_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_to_bs.rb
rename to test/rdoc/rdoc_markup_to_bs_test.rb
diff --git a/test/rdoc/test_rdoc_markup_to_html_crossref.rb b/test/rdoc/rdoc_markup_to_html_crossref_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_to_html_crossref.rb
rename to test/rdoc/rdoc_markup_to_html_crossref_test.rb
diff --git a/test/rdoc/test_rdoc_markup_to_html_snippet.rb b/test/rdoc/rdoc_markup_to_html_snippet_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_markup_to_html_snippet.rb
rename to test/rdoc/rdoc_markup_to_html_snippet_test.rb
index 1a7be9f3dc..4a338271af 100644
--- a/test/rdoc/test_rdoc_markup_to_html_snippet.rb
+++ b/test/rdoc/rdoc_markup_to_html_snippet_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupToHtmlSnippet < RDoc::Markup::FormatterTestCase
+class RDocMarkupToHtmlSnippetTest < RDoc::Markup::FormatterTestCase
 
   add_visitor_tests
 
diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/rdoc_markup_to_html_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_to_html.rb
rename to test/rdoc/rdoc_markup_to_html_test.rb
diff --git a/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb b/test/rdoc/rdoc_markup_to_joined_paragraph_test.rb
similarity index 90%
rename from test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
rename to test/rdoc/rdoc_markup_to_joined_paragraph_test.rb
index 8bd2d67247..89e9736e8a 100644
--- a/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
+++ b/test/rdoc/rdoc_markup_to_joined_paragraph_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupToJoinedParagraph < RDoc::TestCase
+class RDocMarkupToJoinedParagraphTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_markup_to_label.rb b/test/rdoc/rdoc_markup_to_label_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_markup_to_label.rb
rename to test/rdoc/rdoc_markup_to_label_test.rb
index 2bf2e0ecdf..a56480de84 100644
--- a/test/rdoc/test_rdoc_markup_to_label.rb
+++ b/test/rdoc/rdoc_markup_to_label_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupToLabel < RDoc::Markup::FormatterTestCase
+class RDocMarkupToLabelTest < RDoc::Markup::FormatterTestCase
 
   add_visitor_tests
 
diff --git a/test/rdoc/test_rdoc_markup_to_markdown.rb b/test/rdoc/rdoc_markup_to_markdown_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_to_markdown.rb
rename to test/rdoc/rdoc_markup_to_markdown_test.rb
diff --git a/test/rdoc/test_rdoc_markup_to_rdoc.rb b/test/rdoc/rdoc_markup_to_rdoc_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_markup_to_rdoc.rb
rename to test/rdoc/rdoc_markup_to_rdoc_test.rb
diff --git a/test/rdoc/test_rdoc_markup_to_table_of_contents.rb b/test/rdoc/rdoc_markup_to_table_of_contents_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_markup_to_table_of_contents.rb
rename to test/rdoc/rdoc_markup_to_table_of_contents_test.rb
index 7512495aec..3fb6fdeb42 100644
--- a/test/rdoc/test_rdoc_markup_to_table_of_contents.rb
+++ b/test/rdoc/rdoc_markup_to_table_of_contents_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupToTableOfContents < RDoc::Markup::FormatterTestCase
+class RDocMarkupToTableOfContentsTest < RDoc::Markup::FormatterTestCase
 
   add_visitor_tests
 
diff --git a/test/rdoc/test_rdoc_markup_to_tt_only.rb b/test/rdoc/rdoc_markup_to_tt_only_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_markup_to_tt_only.rb
rename to test/rdoc/rdoc_markup_to_tt_only_test.rb
index c709d7a4d5..e5dfc0be96 100644
--- a/test/rdoc/test_rdoc_markup_to_tt_only.rb
+++ b/test/rdoc/rdoc_markup_to_tt_only_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupToTtOnly < RDoc::Markup::FormatterTestCase
+class RDocMarkupToTtOnlyTest < RDoc::Markup::FormatterTestCase
 
   add_visitor_tests
 
diff --git a/test/rdoc/test_rdoc_markup_verbatim.rb b/test/rdoc/rdoc_markup_verbatim_test.rb
similarity index 90%
rename from test/rdoc/test_rdoc_markup_verbatim.rb
rename to test/rdoc/rdoc_markup_verbatim_test.rb
index 2f8a57266a..910095c9ab 100644
--- a/test/rdoc/test_rdoc_markup_verbatim.rb
+++ b/test/rdoc/rdoc_markup_verbatim_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocMarkupVerbatim < RDoc::TestCase
+class RDocMarkupVerbatimTest < RDoc::TestCase
 
   def test_equals2
     v1 = verb('1 + 1')
diff --git a/test/rdoc/test_rdoc_method_attr.rb b/test/rdoc/rdoc_method_attr_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_method_attr.rb
rename to test/rdoc/rdoc_method_attr_test.rb
index d6a3315384..54a2a0d395 100644
--- a/test/rdoc/test_rdoc_method_attr.rb
+++ b/test/rdoc/rdoc_method_attr_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocMethodAttr < XrefTestCase
+class RDocMethodAttrTest < XrefTestCase
 
   def test_initialize_copy
     refute_same @c1_m.full_name, @c1_m.dup.full_name
diff --git a/test/rdoc/test_rdoc_normal_class.rb b/test/rdoc/rdoc_normal_class_test.rb
similarity index 96%
rename from test/rdoc/test_rdoc_normal_class.rb
rename to test/rdoc/rdoc_normal_class_test.rb
index 3d097ebb52..d61ef5ccd9 100644
--- a/test/rdoc/test_rdoc_normal_class.rb
+++ b/test/rdoc/rdoc_normal_class_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocNormalClass < XrefTestCase
+class RDocNormalClassTest < XrefTestCase
 
   def test_ancestors
     klass = @top_level.add_class RDoc::NormalClass, 'Klass'
diff --git a/test/rdoc/test_rdoc_normal_module.rb b/test/rdoc/rdoc_normal_module_test.rb
similarity index 95%
rename from test/rdoc/test_rdoc_normal_module.rb
rename to test/rdoc/rdoc_normal_module_test.rb
index cccee5c44c..bb0a2afc76 100644
--- a/test/rdoc/test_rdoc_normal_module.rb
+++ b/test/rdoc/rdoc_normal_module_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocNormalModule < XrefTestCase
+class RDocNormalModuleTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/rdoc_options_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_options.rb
rename to test/rdoc/rdoc_options_test.rb
index cc3d3edd4d..0300d3fce1 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/rdoc_options_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocOptions < RDoc::TestCase
+class RDocOptionsTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser_c.rb b/test/rdoc/rdoc_parser_c_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_parser_c.rb
rename to test/rdoc/rdoc_parser_c_test.rb
index bf50ac716b..504e2f8b2e 100644
--- a/test/rdoc/test_rdoc_parser_c.rb
+++ b/test/rdoc/rdoc_parser_c_test.rb
@@ -41,7 +41,7 @@
 
 =end
 
-class TestRDocParserC < RDoc::TestCase
+class RDocParserCTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser_changelog.rb b/test/rdoc/rdoc_parser_changelog_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_parser_changelog.rb
rename to test/rdoc/rdoc_parser_changelog_test.rb
index be468e2ff8..4557eacae1 100644
--- a/test/rdoc/test_rdoc_parser_changelog.rb
+++ b/test/rdoc/rdoc_parser_changelog_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocParserChangeLog < RDoc::TestCase
+class RDocParserChangeLogTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser_markdown.rb b/test/rdoc/rdoc_parser_markdown_test.rb
similarity index 96%
rename from test/rdoc/test_rdoc_parser_markdown.rb
rename to test/rdoc/rdoc_parser_markdown_test.rb
index fc0c3b53da..49da5693d6 100644
--- a/test/rdoc/test_rdoc_parser_markdown.rb
+++ b/test/rdoc/rdoc_parser_markdown_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocParserMarkdown < RDoc::TestCase
+class RDocParserMarkdownTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser_prism_ruby.rb b/test/rdoc/rdoc_parser_prism_ruby_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_parser_prism_ruby.rb
rename to test/rdoc/rdoc_parser_prism_ruby_test.rb
index 52b04f8b86..578123b740 100644
--- a/test/rdoc/test_rdoc_parser_prism_ruby.rb
+++ b/test/rdoc/rdoc_parser_prism_ruby_test.rb
@@ -2137,7 +2137,7 @@ class C
   end
 end
 
-class TestRDocParserPrismRuby < RDoc::TestCase
+class RDocParserPrismRubyTest < RDoc::TestCase
   include RDocParserPrismTestCases
 
   def accept_legacy_bug?
@@ -2151,7 +2151,7 @@ def util_parser(content)
 end
 
 # Run the same test with the original RDoc::Parser::Ruby
-class TestRDocParserRubyWithPrismRubyTestCases < RDoc::TestCase
+class RDocParserRubyWithPrismRubyTestCasesTest < RDoc::TestCase
   include RDocParserPrismTestCases
 
   def accept_legacy_bug?
diff --git a/test/rdoc/test_rdoc_parser_rd.rb b/test/rdoc/rdoc_parser_rd_test.rb
similarity index 96%
rename from test/rdoc/test_rdoc_parser_rd.rb
rename to test/rdoc/rdoc_parser_rd_test.rb
index 29ef4436f2..a1e552252a 100644
--- a/test/rdoc/test_rdoc_parser_rd.rb
+++ b/test/rdoc/rdoc_parser_rd_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocParserRd < RDoc::TestCase
+class RDocParserRdTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/rdoc_parser_ruby_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_parser_ruby.rb
rename to test/rdoc/rdoc_parser_ruby_test.rb
index b39ed59ca9..2f4665a25f 100644
--- a/test/rdoc/test_rdoc_parser_ruby.rb
+++ b/test/rdoc/rdoc_parser_ruby_test.rb
@@ -4,7 +4,7 @@
 
 return if ENV['RDOC_USE_PRISM_PARSER']
 
-class TestRDocParserRuby < RDoc::TestCase
+class RDocParserRubyTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser_simple.rb b/test/rdoc/rdoc_parser_simple_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_parser_simple.rb
rename to test/rdoc/rdoc_parser_simple_test.rb
index 5c701d0a08..7296a40064 100644
--- a/test/rdoc/test_rdoc_parser_simple.rb
+++ b/test/rdoc/rdoc_parser_simple_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocParserSimple < RDoc::TestCase
+class RDocParserSimpleTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_parser.rb b/test/rdoc/rdoc_parser_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_parser.rb
rename to test/rdoc/rdoc_parser_test.rb
diff --git a/test/rdoc/test_rdoc_rd_block_parser.rb b/test/rdoc/rdoc_rd_block_parser_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_rd_block_parser.rb
rename to test/rdoc/rdoc_rd_block_parser_test.rb
index a9d457cbb9..50bf075a5a 100644
--- a/test/rdoc/test_rdoc_rd_block_parser.rb
+++ b/test/rdoc/rdoc_rd_block_parser_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocRdBlockParser < RDoc::TestCase
+class RDocRdBlockParserTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_rd_inline_parser.rb b/test/rdoc/rdoc_rd_inline_parser_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_rd_inline_parser.rb
rename to test/rdoc/rdoc_rd_inline_parser_test.rb
index 9ac8dd9f26..e484dbe833 100644
--- a/test/rdoc/test_rdoc_rd_inline_parser.rb
+++ b/test/rdoc/rdoc_rd_inline_parser_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocRdInlineParser < RDoc::TestCase
+class RDocRdInlineParserTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_rd_inline.rb b/test/rdoc/rdoc_rd_inline_test.rb
similarity index 97%
rename from test/rdoc/test_rdoc_rd_inline.rb
rename to test/rdoc/rdoc_rd_inline_test.rb
index 6bfb229933..c4984949f4 100644
--- a/test/rdoc/test_rdoc_rd_inline.rb
+++ b/test/rdoc/rdoc_rd_inline_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocRdInline < RDoc::TestCase
+class RDocRdInlineTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_rd.rb b/test/rdoc/rdoc_rd_test.rb
similarity index 94%
rename from test/rdoc/test_rdoc_rd.rb
rename to test/rdoc/rdoc_rd_test.rb
index 38de575bb0..8842aaccbe 100644
--- a/test/rdoc/test_rdoc_rd.rb
+++ b/test/rdoc/rdoc_rd_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocRd < RDoc::TestCase
+class RDocRdTest < RDoc::TestCase
 
   def test_class_parse
     expected =
diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/rdoc_rdoc_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_rdoc.rb
rename to test/rdoc/rdoc_rdoc_test.rb
index 050f92274f..6760badfe2 100644
--- a/test/rdoc/test_rdoc_rdoc.rb
+++ b/test/rdoc/rdoc_rdoc_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocRDoc < RDoc::TestCase
+class RDocRDocTest < RDoc::TestCase
 
   def setup
     super
@@ -69,7 +69,7 @@ def test_document_with_dry_run # functional test
 
   def test_gather_files
     a = File.expand_path __FILE__
-    b = File.expand_path '../test_rdoc_text.rb', __FILE__
+    b = File.expand_path '../rdoc_text_test.rb', __FILE__
 
     assert_equal [a, b], @rdoc.gather_files([b, a, b])
 
diff --git a/test/rdoc/test_rdoc_require.rb b/test/rdoc/rdoc_require_test.rb
similarity index 92%
rename from test/rdoc/test_rdoc_require.rb
rename to test/rdoc/rdoc_require_test.rb
index 4cc53e6c6c..e90f8520a2 100644
--- a/test/rdoc/test_rdoc_require.rb
+++ b/test/rdoc/rdoc_require_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocRequire < XrefTestCase
+class RDocRequireTest < XrefTestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/rdoc_ri_driver_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_ri_driver.rb
rename to test/rdoc/rdoc_ri_driver_test.rb
diff --git a/test/rdoc/test_rdoc_ri_paths.rb b/test/rdoc/rdoc_ri_paths_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_ri_paths.rb
rename to test/rdoc/rdoc_ri_paths_test.rb
index 6dccd6dbdd..7a9fc6fde4 100644
--- a/test/rdoc/test_rdoc_ri_paths.rb
+++ b/test/rdoc/rdoc_ri_paths_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocRIPaths < RDoc::TestCase
+class RDocRIPathsTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/rdoc_rubygems_hook_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_rubygems_hook.rb
rename to test/rdoc/rdoc_rubygems_hook_test.rb
index 29488e7ac1..99194c59d8 100644
--- a/test/rdoc/test_rdoc_rubygems_hook.rb
+++ b/test/rdoc/rdoc_rubygems_hook_test.rb
@@ -5,7 +5,7 @@
 require_relative '../../lib/rdoc/rubygems_hook'
 require 'test/unit'
 
-class TestRDocRubyGemsHook < Test::Unit::TestCase
+class RDocRubyGemsHookTest < Test::Unit::TestCase
   def setup
     @a = Gem::Specification.new do |s|
       s.platform    = Gem::Platform::RUBY
diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/rdoc_servlet_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_servlet.rb
rename to test/rdoc/rdoc_servlet_test.rb
index 2346d1a595..825abdf4ab 100644
--- a/test/rdoc/test_rdoc_servlet.rb
+++ b/test/rdoc/rdoc_servlet_test.rb
@@ -5,7 +5,7 @@
 rescue LoadError
 end
 
-class TestRDocServlet < RDoc::TestCase
+class RDocServletTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_single_class.rb b/test/rdoc/rdoc_single_class_test.rb
similarity index 86%
rename from test/rdoc/test_rdoc_single_class.rb
rename to test/rdoc/rdoc_single_class_test.rb
index e81a1498ba..6bbc5a2bd4 100644
--- a/test/rdoc/test_rdoc_single_class.rb
+++ b/test/rdoc/rdoc_single_class_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocSingleClass < RDoc::TestCase
+class RDocSingleClassTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_stats.rb b/test/rdoc/rdoc_stats_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_stats.rb
rename to test/rdoc/rdoc_stats_test.rb
index c0cd0db064..1f02e460c3 100644
--- a/test/rdoc/test_rdoc_stats.rb
+++ b/test/rdoc/rdoc_stats_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocStats < RDoc::TestCase
+class RDocStatsTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_store.rb b/test/rdoc/rdoc_store_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_store.rb
rename to test/rdoc/rdoc_store_test.rb
index ed61b8cefd..d22516100e 100644
--- a/test/rdoc/test_rdoc_store.rb
+++ b/test/rdoc/rdoc_store_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'xref_test_case'
 
-class TestRDocStore < XrefTestCase
+class RDocStoreTest < XrefTestCase
 
   OBJECT_ANCESTORS = %w[BasicObject]
 
diff --git a/test/rdoc/test_rdoc_task.rb b/test/rdoc/rdoc_task_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_task.rb
rename to test/rdoc/rdoc_task_test.rb
index 67d223087b..cd37b2520e 100644
--- a/test/rdoc/test_rdoc_task.rb
+++ b/test/rdoc/rdoc_task_test.rb
@@ -5,7 +5,7 @@
 rescue LoadError
 end
 
-class TestRDocTask < RDoc::TestCase
+class RDocTaskTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/rdoc_text_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_text.rb
rename to test/rdoc/rdoc_text_test.rb
index a6b1597bbf..2fd9761400 100644
--- a/test/rdoc/test_rdoc_text.rb
+++ b/test/rdoc/rdoc_text_test.rb
@@ -3,7 +3,7 @@
 require_relative 'helper'
 require 'timeout'
 
-class TestRDocText < RDoc::TestCase
+class RDocTextTest < RDoc::TestCase
 
   include RDoc::Text
 
diff --git a/test/rdoc/test_rdoc_token_stream.rb b/test/rdoc/rdoc_token_stream_test.rb
similarity index 98%
rename from test/rdoc/test_rdoc_token_stream.rb
rename to test/rdoc/rdoc_token_stream_test.rb
index 8fcd3d8f68..a5f1930daa 100644
--- a/test/rdoc/test_rdoc_token_stream.rb
+++ b/test/rdoc/rdoc_token_stream_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocTokenStream < RDoc::TestCase
+class RDocTokenStreamTest < RDoc::TestCase
 
   def test_class_to_html
     tokens = [
diff --git a/test/rdoc/test_rdoc_tom_doc.rb b/test/rdoc/rdoc_tom_doc_test.rb
similarity index 99%
rename from test/rdoc/test_rdoc_tom_doc.rb
rename to test/rdoc/rdoc_tom_doc_test.rb
index ddecea4b21..941d027f24 100644
--- a/test/rdoc/test_rdoc_tom_doc.rb
+++ b/test/rdoc/rdoc_tom_doc_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_relative 'helper'
 
-class TestRDocTomDoc < RDoc::TestCase
+class RDocTomDocTest < RDoc::TestCase
 
   def setup
     super
diff --git a/test/rdoc/test_rdoc_top_level.rb b/test/rdoc/rdoc_top_level_test.rb
similarity index 100%
rename from test/rdoc/test_rdoc_top_level.rb
rename to test/rdoc/rdoc_top_level_test.rb
diff --git a/test/rdoc/support/formatter_test_case.rb b/test/rdoc/support/formatter_test_case.rb
index 9f49dd0897..ae081f5188 100644
--- a/test/rdoc/support/formatter_test_case.rb
+++ b/test/rdoc/support/formatter_test_case.rb
@@ -17,7 +17,7 @@
 #
 # Example:
 #
-#  class TestRDocMarkupToNewFormat < RDoc::Markup::FormatterTestCase
+#  class RDocMarkupToNewFormatTest < RDoc::Markup::FormatterTestCase
 #
 #    add_visitor_tests
 #
diff --git a/test/rdoc/support/text_formatter_test_case.rb b/test/rdoc/support/text_formatter_test_case.rb
index 5a51b16fd7..c45078ce46 100644
--- a/test/rdoc/support/text_formatter_test_case.rb
+++ b/test/rdoc/support/text_formatter_test_case.rb
@@ -7,7 +7,7 @@
 #
 # Example:
 #
-#  class TestRDocMarkupToNewTextFormat < RDoc::Markup::TextFormatterTestCase
+#  class RDocMarkupToNewTextFormatTest < RDoc::Markup::TextFormatterTestCase
 #
 #    add_visitor_tests
 #    add_text_tests