diff --git a/Rakefile b/Rakefile
index 8fbfa03711..297b2424d9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -35,7 +35,7 @@ task ghpages: :rdoc do
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
+  t.libs << "test/rdoc"
   t.verbose = true
   t.test_files = FileList['test/**/test_*.rb']
 end
diff --git a/test/MarkdownTest_1.0.3/Amps and angle encoding.text b/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Amps and angle encoding.text
rename to test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text
diff --git a/test/MarkdownTest_1.0.3/Auto links.text b/test/rdoc/MarkdownTest_1.0.3/Auto links.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Auto links.text
rename to test/rdoc/MarkdownTest_1.0.3/Auto links.text
diff --git a/test/MarkdownTest_1.0.3/Backslash escapes.text b/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Backslash escapes.text
rename to test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text
diff --git a/test/MarkdownTest_1.0.3/Blockquotes with code blocks.text b/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Blockquotes with code blocks.text
rename to test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text
diff --git a/test/MarkdownTest_1.0.3/Code Blocks.text b/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Code Blocks.text
rename to test/rdoc/MarkdownTest_1.0.3/Code Blocks.text
diff --git a/test/MarkdownTest_1.0.3/Code Spans.text b/test/rdoc/MarkdownTest_1.0.3/Code Spans.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Code Spans.text
rename to test/rdoc/MarkdownTest_1.0.3/Code Spans.text
diff --git a/test/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text b/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
rename to test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
diff --git a/test/MarkdownTest_1.0.3/Horizontal rules.text b/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Horizontal rules.text
rename to test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text
diff --git a/test/MarkdownTest_1.0.3/Inline HTML (Advanced).text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Inline HTML (Advanced).text
rename to test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text
diff --git a/test/MarkdownTest_1.0.3/Inline HTML (Simple).text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Inline HTML (Simple).text
rename to test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text
diff --git a/test/MarkdownTest_1.0.3/Inline HTML comments.text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Inline HTML comments.text
rename to test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text
diff --git a/test/MarkdownTest_1.0.3/Links, inline style.text b/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Links, inline style.text
rename to test/rdoc/MarkdownTest_1.0.3/Links, inline style.text
diff --git a/test/MarkdownTest_1.0.3/Links, reference style.text b/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Links, reference style.text
rename to test/rdoc/MarkdownTest_1.0.3/Links, reference style.text
diff --git a/test/MarkdownTest_1.0.3/Links, shortcut references.text b/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Links, shortcut references.text
rename to test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text
diff --git a/test/MarkdownTest_1.0.3/Literal quotes in titles.text b/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Literal quotes in titles.text
rename to test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text
diff --git a/test/MarkdownTest_1.0.3/Markdown Documentation - Basics.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
rename to test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
diff --git a/test/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
rename to test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
diff --git a/test/MarkdownTest_1.0.3/Nested blockquotes.text b/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Nested blockquotes.text
rename to test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text
diff --git a/test/MarkdownTest_1.0.3/Ordered and unordered lists.text b/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Ordered and unordered lists.text
rename to test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text
diff --git a/test/MarkdownTest_1.0.3/Strong and em together.text b/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Strong and em together.text
rename to test/rdoc/MarkdownTest_1.0.3/Strong and em together.text
diff --git a/test/MarkdownTest_1.0.3/Tabs.text b/test/rdoc/MarkdownTest_1.0.3/Tabs.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Tabs.text
rename to test/rdoc/MarkdownTest_1.0.3/Tabs.text
diff --git a/test/MarkdownTest_1.0.3/Tidyness.text b/test/rdoc/MarkdownTest_1.0.3/Tidyness.text
similarity index 100%
rename from test/MarkdownTest_1.0.3/Tidyness.text
rename to test/rdoc/MarkdownTest_1.0.3/Tidyness.text
diff --git a/test/README b/test/rdoc/README
similarity index 100%
rename from test/README
rename to test/rdoc/README
diff --git a/test/binary.dat b/test/rdoc/binary.dat
similarity index 100%
rename from test/binary.dat
rename to test/rdoc/binary.dat
diff --git a/test/hidden.zip.txt b/test/rdoc/hidden.zip.txt
similarity index 100%
rename from test/hidden.zip.txt
rename to test/rdoc/hidden.zip.txt
diff --git a/test/minitest_helper.rb b/test/rdoc/minitest_helper.rb
similarity index 100%
rename from test/minitest_helper.rb
rename to test/rdoc/minitest_helper.rb
diff --git a/test/test.ja.largedoc b/test/rdoc/test.ja.largedoc
similarity index 100%
rename from test/test.ja.largedoc
rename to test/rdoc/test.ja.largedoc
diff --git a/test/test.ja.rdoc b/test/rdoc/test.ja.rdoc
similarity index 100%
rename from test/test.ja.rdoc
rename to test/rdoc/test.ja.rdoc
diff --git a/test/test.ja.txt b/test/rdoc/test.ja.txt
similarity index 100%
rename from test/test.ja.txt
rename to test/rdoc/test.ja.txt
diff --git a/test/test.txt b/test/rdoc/test.txt
similarity index 100%
rename from test/test.txt
rename to test/rdoc/test.txt
diff --git a/test/test_rdoc_alias.rb b/test/rdoc/test_rdoc_alias.rb
similarity index 100%
rename from test/test_rdoc_alias.rb
rename to test/rdoc/test_rdoc_alias.rb
diff --git a/test/test_rdoc_any_method.rb b/test/rdoc/test_rdoc_any_method.rb
similarity index 100%
rename from test/test_rdoc_any_method.rb
rename to test/rdoc/test_rdoc_any_method.rb
diff --git a/test/test_rdoc_attr.rb b/test/rdoc/test_rdoc_attr.rb
similarity index 100%
rename from test/test_rdoc_attr.rb
rename to test/rdoc/test_rdoc_attr.rb
diff --git a/test/test_rdoc_class_module.rb b/test/rdoc/test_rdoc_class_module.rb
similarity index 100%
rename from test/test_rdoc_class_module.rb
rename to test/rdoc/test_rdoc_class_module.rb
diff --git a/test/test_rdoc_code_object.rb b/test/rdoc/test_rdoc_code_object.rb
similarity index 100%
rename from test/test_rdoc_code_object.rb
rename to test/rdoc/test_rdoc_code_object.rb
diff --git a/test/test_rdoc_comment.rb b/test/rdoc/test_rdoc_comment.rb
similarity index 100%
rename from test/test_rdoc_comment.rb
rename to test/rdoc/test_rdoc_comment.rb
diff --git a/test/test_rdoc_constant.rb b/test/rdoc/test_rdoc_constant.rb
similarity index 100%
rename from test/test_rdoc_constant.rb
rename to test/rdoc/test_rdoc_constant.rb
diff --git a/test/test_rdoc_context.rb b/test/rdoc/test_rdoc_context.rb
similarity index 100%
rename from test/test_rdoc_context.rb
rename to test/rdoc/test_rdoc_context.rb
diff --git a/test/test_rdoc_context_section.rb b/test/rdoc/test_rdoc_context_section.rb
similarity index 100%
rename from test/test_rdoc_context_section.rb
rename to test/rdoc/test_rdoc_context_section.rb
diff --git a/test/test_rdoc_cross_reference.rb b/test/rdoc/test_rdoc_cross_reference.rb
similarity index 100%
rename from test/test_rdoc_cross_reference.rb
rename to test/rdoc/test_rdoc_cross_reference.rb
diff --git a/test/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb
similarity index 100%
rename from test/test_rdoc_encoding.rb
rename to test/rdoc/test_rdoc_encoding.rb
diff --git a/test/test_rdoc_extend.rb b/test/rdoc/test_rdoc_extend.rb
similarity index 100%
rename from test/test_rdoc_extend.rb
rename to test/rdoc/test_rdoc_extend.rb
diff --git a/test/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
similarity index 100%
rename from test/test_rdoc_generator_darkfish.rb
rename to test/rdoc/test_rdoc_generator_darkfish.rb
diff --git a/test/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
similarity index 100%
rename from test/test_rdoc_generator_json_index.rb
rename to test/rdoc/test_rdoc_generator_json_index.rb
diff --git a/test/test_rdoc_generator_markup.rb b/test/rdoc/test_rdoc_generator_markup.rb
similarity index 100%
rename from test/test_rdoc_generator_markup.rb
rename to test/rdoc/test_rdoc_generator_markup.rb
diff --git a/test/test_rdoc_generator_pot.rb b/test/rdoc/test_rdoc_generator_pot.rb
similarity index 100%
rename from test/test_rdoc_generator_pot.rb
rename to test/rdoc/test_rdoc_generator_pot.rb
diff --git a/test/test_rdoc_generator_pot_po.rb b/test/rdoc/test_rdoc_generator_pot_po.rb
similarity index 100%
rename from test/test_rdoc_generator_pot_po.rb
rename to test/rdoc/test_rdoc_generator_pot_po.rb
diff --git a/test/test_rdoc_generator_pot_po_entry.rb b/test/rdoc/test_rdoc_generator_pot_po_entry.rb
similarity index 100%
rename from test/test_rdoc_generator_pot_po_entry.rb
rename to test/rdoc/test_rdoc_generator_pot_po_entry.rb
diff --git a/test/test_rdoc_generator_ri.rb b/test/rdoc/test_rdoc_generator_ri.rb
similarity index 100%
rename from test/test_rdoc_generator_ri.rb
rename to test/rdoc/test_rdoc_generator_ri.rb
diff --git a/test/test_rdoc_i18n_locale.rb b/test/rdoc/test_rdoc_i18n_locale.rb
similarity index 100%
rename from test/test_rdoc_i18n_locale.rb
rename to test/rdoc/test_rdoc_i18n_locale.rb
diff --git a/test/test_rdoc_i18n_text.rb b/test/rdoc/test_rdoc_i18n_text.rb
similarity index 100%
rename from test/test_rdoc_i18n_text.rb
rename to test/rdoc/test_rdoc_i18n_text.rb
diff --git a/test/test_rdoc_include.rb b/test/rdoc/test_rdoc_include.rb
similarity index 100%
rename from test/test_rdoc_include.rb
rename to test/rdoc/test_rdoc_include.rb
diff --git a/test/test_rdoc_markdown.rb b/test/rdoc/test_rdoc_markdown.rb
similarity index 100%
rename from test/test_rdoc_markdown.rb
rename to test/rdoc/test_rdoc_markdown.rb
diff --git a/test/test_rdoc_markdown_test.rb b/test/rdoc/test_rdoc_markdown_test.rb
similarity index 100%
rename from test/test_rdoc_markdown_test.rb
rename to test/rdoc/test_rdoc_markdown_test.rb
diff --git a/test/test_rdoc_markup.rb b/test/rdoc/test_rdoc_markup.rb
similarity index 100%
rename from test/test_rdoc_markup.rb
rename to test/rdoc/test_rdoc_markup.rb
diff --git a/test/test_rdoc_markup_attribute_manager.rb b/test/rdoc/test_rdoc_markup_attribute_manager.rb
similarity index 100%
rename from test/test_rdoc_markup_attribute_manager.rb
rename to test/rdoc/test_rdoc_markup_attribute_manager.rb
diff --git a/test/test_rdoc_markup_attributes.rb b/test/rdoc/test_rdoc_markup_attributes.rb
similarity index 100%
rename from test/test_rdoc_markup_attributes.rb
rename to test/rdoc/test_rdoc_markup_attributes.rb
diff --git a/test/test_rdoc_markup_document.rb b/test/rdoc/test_rdoc_markup_document.rb
similarity index 100%
rename from test/test_rdoc_markup_document.rb
rename to test/rdoc/test_rdoc_markup_document.rb
diff --git a/test/test_rdoc_markup_formatter.rb b/test/rdoc/test_rdoc_markup_formatter.rb
similarity index 100%
rename from test/test_rdoc_markup_formatter.rb
rename to test/rdoc/test_rdoc_markup_formatter.rb
diff --git a/test/test_rdoc_markup_hard_break.rb b/test/rdoc/test_rdoc_markup_hard_break.rb
similarity index 100%
rename from test/test_rdoc_markup_hard_break.rb
rename to test/rdoc/test_rdoc_markup_hard_break.rb
diff --git a/test/test_rdoc_markup_heading.rb b/test/rdoc/test_rdoc_markup_heading.rb
similarity index 100%
rename from test/test_rdoc_markup_heading.rb
rename to test/rdoc/test_rdoc_markup_heading.rb
diff --git a/test/test_rdoc_markup_include.rb b/test/rdoc/test_rdoc_markup_include.rb
similarity index 100%
rename from test/test_rdoc_markup_include.rb
rename to test/rdoc/test_rdoc_markup_include.rb
diff --git a/test/test_rdoc_markup_indented_paragraph.rb b/test/rdoc/test_rdoc_markup_indented_paragraph.rb
similarity index 100%
rename from test/test_rdoc_markup_indented_paragraph.rb
rename to test/rdoc/test_rdoc_markup_indented_paragraph.rb
diff --git a/test/test_rdoc_markup_paragraph.rb b/test/rdoc/test_rdoc_markup_paragraph.rb
similarity index 100%
rename from test/test_rdoc_markup_paragraph.rb
rename to test/rdoc/test_rdoc_markup_paragraph.rb
diff --git a/test/test_rdoc_markup_parser.rb b/test/rdoc/test_rdoc_markup_parser.rb
similarity index 100%
rename from test/test_rdoc_markup_parser.rb
rename to test/rdoc/test_rdoc_markup_parser.rb
diff --git a/test/test_rdoc_markup_pre_process.rb b/test/rdoc/test_rdoc_markup_pre_process.rb
similarity index 100%
rename from test/test_rdoc_markup_pre_process.rb
rename to test/rdoc/test_rdoc_markup_pre_process.rb
diff --git a/test/test_rdoc_markup_raw.rb b/test/rdoc/test_rdoc_markup_raw.rb
similarity index 100%
rename from test/test_rdoc_markup_raw.rb
rename to test/rdoc/test_rdoc_markup_raw.rb
diff --git a/test/test_rdoc_markup_to_ansi.rb b/test/rdoc/test_rdoc_markup_to_ansi.rb
similarity index 100%
rename from test/test_rdoc_markup_to_ansi.rb
rename to test/rdoc/test_rdoc_markup_to_ansi.rb
diff --git a/test/test_rdoc_markup_to_bs.rb b/test/rdoc/test_rdoc_markup_to_bs.rb
similarity index 100%
rename from test/test_rdoc_markup_to_bs.rb
rename to test/rdoc/test_rdoc_markup_to_bs.rb
diff --git a/test/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb
similarity index 100%
rename from test/test_rdoc_markup_to_html.rb
rename to test/rdoc/test_rdoc_markup_to_html.rb
diff --git a/test/test_rdoc_markup_to_html_crossref.rb b/test/rdoc/test_rdoc_markup_to_html_crossref.rb
similarity index 100%
rename from test/test_rdoc_markup_to_html_crossref.rb
rename to test/rdoc/test_rdoc_markup_to_html_crossref.rb
diff --git a/test/test_rdoc_markup_to_html_snippet.rb b/test/rdoc/test_rdoc_markup_to_html_snippet.rb
similarity index 100%
rename from test/test_rdoc_markup_to_html_snippet.rb
rename to test/rdoc/test_rdoc_markup_to_html_snippet.rb
diff --git a/test/test_rdoc_markup_to_joined_paragraph.rb b/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
similarity index 100%
rename from test/test_rdoc_markup_to_joined_paragraph.rb
rename to test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
diff --git a/test/test_rdoc_markup_to_label.rb b/test/rdoc/test_rdoc_markup_to_label.rb
similarity index 100%
rename from test/test_rdoc_markup_to_label.rb
rename to test/rdoc/test_rdoc_markup_to_label.rb
diff --git a/test/test_rdoc_markup_to_markdown.rb b/test/rdoc/test_rdoc_markup_to_markdown.rb
similarity index 100%
rename from test/test_rdoc_markup_to_markdown.rb
rename to test/rdoc/test_rdoc_markup_to_markdown.rb
diff --git a/test/test_rdoc_markup_to_rdoc.rb b/test/rdoc/test_rdoc_markup_to_rdoc.rb
similarity index 100%
rename from test/test_rdoc_markup_to_rdoc.rb
rename to test/rdoc/test_rdoc_markup_to_rdoc.rb
diff --git a/test/test_rdoc_markup_to_table_of_contents.rb b/test/rdoc/test_rdoc_markup_to_table_of_contents.rb
similarity index 100%
rename from test/test_rdoc_markup_to_table_of_contents.rb
rename to test/rdoc/test_rdoc_markup_to_table_of_contents.rb
diff --git a/test/test_rdoc_markup_to_tt_only.rb b/test/rdoc/test_rdoc_markup_to_tt_only.rb
similarity index 100%
rename from test/test_rdoc_markup_to_tt_only.rb
rename to test/rdoc/test_rdoc_markup_to_tt_only.rb
diff --git a/test/test_rdoc_markup_verbatim.rb b/test/rdoc/test_rdoc_markup_verbatim.rb
similarity index 100%
rename from test/test_rdoc_markup_verbatim.rb
rename to test/rdoc/test_rdoc_markup_verbatim.rb
diff --git a/test/test_rdoc_method_attr.rb b/test/rdoc/test_rdoc_method_attr.rb
similarity index 100%
rename from test/test_rdoc_method_attr.rb
rename to test/rdoc/test_rdoc_method_attr.rb
diff --git a/test/test_rdoc_normal_class.rb b/test/rdoc/test_rdoc_normal_class.rb
similarity index 100%
rename from test/test_rdoc_normal_class.rb
rename to test/rdoc/test_rdoc_normal_class.rb
diff --git a/test/test_rdoc_normal_module.rb b/test/rdoc/test_rdoc_normal_module.rb
similarity index 100%
rename from test/test_rdoc_normal_module.rb
rename to test/rdoc/test_rdoc_normal_module.rb
diff --git a/test/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
similarity index 100%
rename from test/test_rdoc_options.rb
rename to test/rdoc/test_rdoc_options.rb
diff --git a/test/test_rdoc_parser.rb b/test/rdoc/test_rdoc_parser.rb
similarity index 100%
rename from test/test_rdoc_parser.rb
rename to test/rdoc/test_rdoc_parser.rb
diff --git a/test/test_rdoc_parser_c.rb b/test/rdoc/test_rdoc_parser_c.rb
similarity index 100%
rename from test/test_rdoc_parser_c.rb
rename to test/rdoc/test_rdoc_parser_c.rb
diff --git a/test/test_rdoc_parser_changelog.rb b/test/rdoc/test_rdoc_parser_changelog.rb
similarity index 100%
rename from test/test_rdoc_parser_changelog.rb
rename to test/rdoc/test_rdoc_parser_changelog.rb
diff --git a/test/test_rdoc_parser_markdown.rb b/test/rdoc/test_rdoc_parser_markdown.rb
similarity index 100%
rename from test/test_rdoc_parser_markdown.rb
rename to test/rdoc/test_rdoc_parser_markdown.rb
diff --git a/test/test_rdoc_parser_rd.rb b/test/rdoc/test_rdoc_parser_rd.rb
similarity index 100%
rename from test/test_rdoc_parser_rd.rb
rename to test/rdoc/test_rdoc_parser_rd.rb
diff --git a/test/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb
similarity index 100%
rename from test/test_rdoc_parser_ruby.rb
rename to test/rdoc/test_rdoc_parser_ruby.rb
diff --git a/test/test_rdoc_parser_simple.rb b/test/rdoc/test_rdoc_parser_simple.rb
similarity index 100%
rename from test/test_rdoc_parser_simple.rb
rename to test/rdoc/test_rdoc_parser_simple.rb
diff --git a/test/test_rdoc_rd.rb b/test/rdoc/test_rdoc_rd.rb
similarity index 100%
rename from test/test_rdoc_rd.rb
rename to test/rdoc/test_rdoc_rd.rb
diff --git a/test/test_rdoc_rd_block_parser.rb b/test/rdoc/test_rdoc_rd_block_parser.rb
similarity index 100%
rename from test/test_rdoc_rd_block_parser.rb
rename to test/rdoc/test_rdoc_rd_block_parser.rb
diff --git a/test/test_rdoc_rd_inline.rb b/test/rdoc/test_rdoc_rd_inline.rb
similarity index 100%
rename from test/test_rdoc_rd_inline.rb
rename to test/rdoc/test_rdoc_rd_inline.rb
diff --git a/test/test_rdoc_rd_inline_parser.rb b/test/rdoc/test_rdoc_rd_inline_parser.rb
similarity index 100%
rename from test/test_rdoc_rd_inline_parser.rb
rename to test/rdoc/test_rdoc_rd_inline_parser.rb
diff --git a/test/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb
similarity index 100%
rename from test/test_rdoc_rdoc.rb
rename to test/rdoc/test_rdoc_rdoc.rb
diff --git a/test/test_rdoc_require.rb b/test/rdoc/test_rdoc_require.rb
similarity index 100%
rename from test/test_rdoc_require.rb
rename to test/rdoc/test_rdoc_require.rb
diff --git a/test/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb
similarity index 100%
rename from test/test_rdoc_ri_driver.rb
rename to test/rdoc/test_rdoc_ri_driver.rb
diff --git a/test/test_rdoc_ri_paths.rb b/test/rdoc/test_rdoc_ri_paths.rb
similarity index 100%
rename from test/test_rdoc_ri_paths.rb
rename to test/rdoc/test_rdoc_ri_paths.rb
diff --git a/test/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb
similarity index 100%
rename from test/test_rdoc_rubygems_hook.rb
rename to test/rdoc/test_rdoc_rubygems_hook.rb
diff --git a/test/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb
similarity index 100%
rename from test/test_rdoc_servlet.rb
rename to test/rdoc/test_rdoc_servlet.rb
diff --git a/test/test_rdoc_single_class.rb b/test/rdoc/test_rdoc_single_class.rb
similarity index 100%
rename from test/test_rdoc_single_class.rb
rename to test/rdoc/test_rdoc_single_class.rb
diff --git a/test/test_rdoc_stats.rb b/test/rdoc/test_rdoc_stats.rb
similarity index 100%
rename from test/test_rdoc_stats.rb
rename to test/rdoc/test_rdoc_stats.rb
diff --git a/test/test_rdoc_store.rb b/test/rdoc/test_rdoc_store.rb
similarity index 100%
rename from test/test_rdoc_store.rb
rename to test/rdoc/test_rdoc_store.rb
diff --git a/test/test_rdoc_task.rb b/test/rdoc/test_rdoc_task.rb
similarity index 100%
rename from test/test_rdoc_task.rb
rename to test/rdoc/test_rdoc_task.rb
diff --git a/test/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb
similarity index 100%
rename from test/test_rdoc_text.rb
rename to test/rdoc/test_rdoc_text.rb
diff --git a/test/test_rdoc_token_stream.rb b/test/rdoc/test_rdoc_token_stream.rb
similarity index 100%
rename from test/test_rdoc_token_stream.rb
rename to test/rdoc/test_rdoc_token_stream.rb
diff --git a/test/test_rdoc_tom_doc.rb b/test/rdoc/test_rdoc_tom_doc.rb
similarity index 100%
rename from test/test_rdoc_tom_doc.rb
rename to test/rdoc/test_rdoc_tom_doc.rb
diff --git a/test/test_rdoc_top_level.rb b/test/rdoc/test_rdoc_top_level.rb
similarity index 100%
rename from test/test_rdoc_top_level.rb
rename to test/rdoc/test_rdoc_top_level.rb
diff --git a/test/xref_data.rb b/test/rdoc/xref_data.rb
similarity index 100%
rename from test/xref_data.rb
rename to test/rdoc/xref_data.rb
diff --git a/test/xref_test_case.rb b/test/rdoc/xref_test_case.rb
similarity index 100%
rename from test/xref_test_case.rb
rename to test/rdoc/xref_test_case.rb