diff --git a/Document/tests/bbcode/docbook_visitor_tests.php b/Document/tests/bbcode/docbook_visitor_test.php
similarity index 100%
rename from Document/tests/bbcode/docbook_visitor_tests.php
rename to Document/tests/bbcode/docbook_visitor_test.php
diff --git a/Document/tests/bbcode/parser_tests.php b/Document/tests/bbcode/parser_test.php
similarity index 100%
rename from Document/tests/bbcode/parser_tests.php
rename to Document/tests/bbcode/parser_test.php
diff --git a/Document/tests/bbcode/tokenizer_tests.php b/Document/tests/bbcode/tokenizer_test.php
similarity index 100%
rename from Document/tests/bbcode/tokenizer_tests.php
rename to Document/tests/bbcode/tokenizer_test.php
diff --git a/Document/tests/document_ezxml_tests.php b/Document/tests/document_ezxml_test.php
similarity index 100%
rename from Document/tests/document_ezxml_tests.php
rename to Document/tests/document_ezxml_test.php
diff --git a/Document/tests/document_odt_docbook_tests.php b/Document/tests/document_odt_docbook_test.php
similarity index 100%
rename from Document/tests/document_odt_docbook_tests.php
rename to Document/tests/document_odt_docbook_test.php
diff --git a/Document/tests/document_rst_parser_tests.php b/Document/tests/document_rst_parser_test.php
similarity index 100%
rename from Document/tests/document_rst_parser_tests.php
rename to Document/tests/document_rst_parser_test.php
diff --git a/Document/tests/document_rst_stack_tests.php b/Document/tests/document_rst_stack_test.php
similarity index 100%
rename from Document/tests/document_rst_stack_tests.php
rename to Document/tests/document_rst_stack_test.php
diff --git a/Document/tests/document_rst_tokenizer_tests.php b/Document/tests/document_rst_tokenizer_test.php
similarity index 100%
rename from Document/tests/document_rst_tokenizer_tests.php
rename to Document/tests/document_rst_tokenizer_test.php
diff --git a/Document/tests/document_rst_validation_tests.php b/Document/tests/document_rst_validation_test.php
similarity index 100%
rename from Document/tests/document_rst_validation_tests.php
rename to Document/tests/document_rst_validation_test.php
diff --git a/Document/tests/document_rst_visitor_docbook_tests.php b/Document/tests/document_rst_visitor_docbook_test.php
similarity index 100%
rename from Document/tests/document_rst_visitor_docbook_tests.php
rename to Document/tests/document_rst_visitor_docbook_test.php
diff --git a/Document/tests/document_rst_visitor_xhtml_body_tests.php b/Document/tests/document_rst_visitor_xhtml_body_test.php
similarity index 100%
rename from Document/tests/document_rst_visitor_xhtml_body_tests.php
rename to Document/tests/document_rst_visitor_xhtml_body_test.php
diff --git a/Document/tests/document_rst_visitor_xhtml_tests.php b/Document/tests/document_rst_visitor_xhtml_test.php
similarity index 100%
rename from Document/tests/document_rst_visitor_xhtml_tests.php
rename to Document/tests/document_rst_visitor_xhtml_test.php
diff --git a/Document/tests/document_wiki_confluence_tokenizer_tests.php b/Document/tests/document_wiki_confluence_tokenizer_test.php
similarity index 100%
rename from Document/tests/document_wiki_confluence_tokenizer_tests.php
rename to Document/tests/document_wiki_confluence_tokenizer_test.php
diff --git a/Document/tests/document_wiki_creole_tokenizer_tests.php b/Document/tests/document_wiki_creole_tokenizer_test.php
similarity index 100%
rename from Document/tests/document_wiki_creole_tokenizer_tests.php
rename to Document/tests/document_wiki_creole_tokenizer_test.php
diff --git a/Document/tests/document_wiki_dokuwiki_tokenizer_tests.php b/Document/tests/document_wiki_dokuwiki_tokenizer_test.php
similarity index 100%
rename from Document/tests/document_wiki_dokuwiki_tokenizer_tests.php
rename to Document/tests/document_wiki_dokuwiki_tokenizer_test.php
diff --git a/Document/tests/document_wiki_mediawiki_tokenizer_tests.php b/Document/tests/document_wiki_mediawiki_tokenizer_test.php
similarity index 100%
rename from Document/tests/document_wiki_mediawiki_tokenizer_tests.php
rename to Document/tests/document_wiki_mediawiki_tokenizer_test.php
diff --git a/Document/tests/document_wiki_parser_tests.php b/Document/tests/document_wiki_parser_test.php
similarity index 100%
rename from Document/tests/document_wiki_parser_tests.php
rename to Document/tests/document_wiki_parser_test.php
diff --git a/Document/tests/document_wiki_tests.php b/Document/tests/document_wiki_test.php
similarity index 100%
rename from Document/tests/document_wiki_tests.php
rename to Document/tests/document_wiki_test.php
diff --git a/Document/tests/document_wiki_visitor_docbook_tests.php b/Document/tests/document_wiki_visitor_docbook_test.php
similarity index 100%
rename from Document/tests/document_wiki_visitor_docbook_tests.php
rename to Document/tests/document_wiki_visitor_docbook_test.php
diff --git a/Document/tests/document_xhtml_docbook_tests.php b/Document/tests/document_xhtml_docbook_test.php
similarity index 100%
rename from Document/tests/document_xhtml_docbook_tests.php
rename to Document/tests/document_xhtml_docbook_test.php
diff --git a/Document/tests/document_xhtml_validation_tests.php b/Document/tests/document_xhtml_validation_test.php
similarity index 100%
rename from Document/tests/document_xhtml_validation_tests.php
rename to Document/tests/document_xhtml_validation_test.php
diff --git a/Document/tests/odt/formatting_properties.php b/Document/tests/odt/formatting_properties_test.php
similarity index 100%
rename from Document/tests/odt/formatting_properties.php
rename to Document/tests/odt/formatting_properties_test.php
diff --git a/Document/tests/odt/formatting_property_collection.php b/Document/tests/odt/formatting_property_collection_test.php
similarity index 100%
rename from Document/tests/odt/formatting_property_collection.php
rename to Document/tests/odt/formatting_property_collection_test.php
diff --git a/Document/tests/odt/style_converters.php b/Document/tests/odt/style_converters_test.php
similarity index 100%
rename from Document/tests/odt/style_converters.php
rename to Document/tests/odt/style_converters_test.php
diff --git a/Document/tests/odt/style.php b/Document/tests/odt/style_test.php
similarity index 100%
rename from Document/tests/odt/style.php
rename to Document/tests/odt/style_test.php
diff --git a/Document/tests/pcss/location_id_tests.php b/Document/tests/pcss/location_id_test.php
similarity index 100%
rename from Document/tests/pcss/location_id_tests.php
rename to Document/tests/pcss/location_id_test.php
diff --git a/Document/tests/pcss/match_location_id_tests.php b/Document/tests/pcss/match_location_id_test.php
similarity index 100%
rename from Document/tests/pcss/match_location_id_tests.php
rename to Document/tests/pcss/match_location_id_test.php
diff --git a/Document/tests/pcss/measure_tests.php b/Document/tests/pcss/measure_test.php
similarity index 100%
rename from Document/tests/pcss/measure_tests.php
rename to Document/tests/pcss/measure_test.php
diff --git a/Document/tests/pcss/style_inference_tests.php b/Document/tests/pcss/style_inference_test.php
similarity index 100%
rename from Document/tests/pcss/style_inference_tests.php
rename to Document/tests/pcss/style_inference_test.php
diff --git a/Document/tests/pcss/value_parser_tests.php b/Document/tests/pcss/value_parser_test.php
similarity index 100%
rename from Document/tests/pcss/value_parser_tests.php
rename to Document/tests/pcss/value_parser_test.php
diff --git a/Document/tests/pdf/hyphenator_tests.php b/Document/tests/pdf/hyphenator_test.php
similarity index 100%
rename from Document/tests/pdf/hyphenator_tests.php
rename to Document/tests/pdf/hyphenator_test.php
diff --git a/Document/tests/pdf/list_item_generator_tests.php b/Document/tests/pdf/list_item_generator_test.php
similarity index 100%
rename from Document/tests/pdf/list_item_generator_tests.php
rename to Document/tests/pdf/list_item_generator_test.php
diff --git a/Document/tests/pdf/literal_tokenizer_tests.php b/Document/tests/pdf/literal_tokenizer_test.php
similarity index 100%
rename from Document/tests/pdf/literal_tokenizer_tests.php
rename to Document/tests/pdf/literal_tokenizer_test.php
diff --git a/Document/tests/pdf/page_tests.php b/Document/tests/pdf/page_test.php
similarity index 100%
rename from Document/tests/pdf/page_tests.php
rename to Document/tests/pdf/page_test.php
diff --git a/Document/tests/pdf/table_column_width_tests.php b/Document/tests/pdf/table_column_width_test.php
similarity index 100%
rename from Document/tests/pdf/table_column_width_tests.php
rename to Document/tests/pdf/table_column_width_test.php
diff --git a/Document/tests/pdf/tokenizer_tests.php b/Document/tests/pdf/tokenizer_test.php
similarity index 100%
rename from Document/tests/pdf/tokenizer_tests.php
rename to Document/tests/pdf/tokenizer_test.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3d74d5a..8cf3a48 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -25,6 +25,10 @@
         <directory suffix="_test.php">Base/tests</directory>
       </testsuite>
 -->
+      <testsuite name="Document">
+        <directory suffix="_test.php">Document/tests</directory>
+      </testsuite>
+
       <testsuite name="MvcTools">
         <directory suffix="_test.php">MvcTools/tests</directory>
       </testsuite>