From fbc595ebed59554ee50b467a867a76a8bb4ba430 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Mon, 18 Feb 2008 04:41:42 +0000
Subject: [PATCH] Remove includes from unit tests.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1569 48356398-32a2-884e-a903-53898d9a118a
---
 TODO                                             |  2 --
 maintenance/generate-standalone.php              | 16 ----------------
 maintenance/remove-require-once.php              |  6 +++---
 tests/HTMLPurifier/AttrCollectionsTest.php       |  2 --
 .../HTMLPurifier/AttrDef/CSS/AlphaValueTest.php  |  3 ---
 .../AttrDef/CSS/BackgroundPositionTest.php       |  3 ---
 .../HTMLPurifier/AttrDef/CSS/BackgroundTest.php  |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/BorderTest.php    |  2 --
 tests/HTMLPurifier/AttrDef/CSS/ColorTest.php     |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/FilterTest.php    |  3 ---
 .../HTMLPurifier/AttrDef/CSS/FontFamilyTest.php  |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/FontTest.php      |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/LengthTest.php    |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php  |  5 -----
 tests/HTMLPurifier/AttrDef/CSS/NumberTest.php    |  3 ---
 .../HTMLPurifier/AttrDef/CSS/PercentageTest.php  |  3 ---
 .../AttrDef/CSS/TextDecorationTest.php           |  3 ---
 tests/HTMLPurifier/AttrDef/CSS/URITest.php       |  3 ---
 tests/HTMLPurifier/AttrDef/CSSTest.php           |  3 ---
 tests/HTMLPurifier/AttrDef/EnumTest.php          |  3 ---
 tests/HTMLPurifier/AttrDef/HTML/BoolTest.php     |  3 ---
 tests/HTMLPurifier/AttrDef/HTML/ColorTest.php    |  3 ---
 .../AttrDef/HTML/FrameTargetTest.php             |  3 ---
 tests/HTMLPurifier/AttrDef/HTML/IDTest.php       |  4 ----
 tests/HTMLPurifier/AttrDef/HTML/LengthTest.php   |  3 ---
 .../HTMLPurifier/AttrDef/HTML/LinkTypesTest.php  |  3 ---
 .../AttrDef/HTML/MultiLengthTest.php             |  3 ---
 tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php |  3 ---
 tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php   |  3 ---
 tests/HTMLPurifier/AttrDef/IntegerTest.php       |  3 ---
 tests/HTMLPurifier/AttrDef/LangTest.php          |  3 ---
 tests/HTMLPurifier/AttrDef/TextTest.php          |  3 ---
 .../AttrDef/URI/Email/SimpleCheckTest.php        |  3 ---
 tests/HTMLPurifier/AttrDef/URI/EmailHarness.php  |  3 ---
 tests/HTMLPurifier/AttrDef/URI/HostTest.php      |  3 ---
 tests/HTMLPurifier/AttrDef/URI/IPv4Test.php      |  3 ---
 tests/HTMLPurifier/AttrDef/URI/IPv6Test.php      |  3 ---
 tests/HTMLPurifier/AttrDef/URITest.php           |  4 ----
 tests/HTMLPurifier/AttrDefTest.php               |  2 --
 tests/HTMLPurifier/AttrTransform/BdoDirTest.php  |  3 ---
 tests/HTMLPurifier/AttrTransform/BgColorTest.php |  3 ---
 .../HTMLPurifier/AttrTransform/BoolToCSSTest.php |  3 ---
 tests/HTMLPurifier/AttrTransform/BorderTest.php  |  4 ----
 .../HTMLPurifier/AttrTransform/EnumToCSSTest.php |  3 ---
 .../AttrTransform/ImgRequiredTest.php            |  3 ---
 .../HTMLPurifier/AttrTransform/ImgSpaceTest.php  |  4 ----
 tests/HTMLPurifier/AttrTransform/LangTest.php    |  4 ----
 tests/HTMLPurifier/AttrTransform/LengthTest.php  |  3 ---
 tests/HTMLPurifier/AttrTransform/NameTest.php    |  3 ---
 tests/HTMLPurifier/AttrTransformHarness.php      |  2 --
 tests/HTMLPurifier/AttrTransformTest.php         |  2 --
 tests/HTMLPurifier/AttrTypesTest.php             |  2 --
 tests/HTMLPurifier/AttrValidator_ErrorsTest.php  |  3 ---
 tests/HTMLPurifier/ChildDef/ChameleonTest.php    |  3 ---
 tests/HTMLPurifier/ChildDef/CustomTest.php       |  3 ---
 tests/HTMLPurifier/ChildDef/OptionalTest.php     |  3 ---
 tests/HTMLPurifier/ChildDef/RequiredTest.php     |  3 ---
 .../ChildDef/StrictBlockquoteTest.php            |  3 ---
 tests/HTMLPurifier/ChildDef/TableTest.php        |  3 ---
 tests/HTMLPurifier/ChildDefHarness.php           |  3 ---
 tests/HTMLPurifier/ComplexHarness.php            |  2 --
 tests/HTMLPurifier/ConfigSchemaTest.php          |  2 --
 tests/HTMLPurifier/ConfigTest.php                |  2 --
 tests/HTMLPurifier/ContextTest.php               |  4 ----
 .../DefinitionCache/Decorator/CleanupTest.php    |  3 ---
 .../DefinitionCache/Decorator/MemoryTest.php     |  3 ---
 .../DefinitionCache/DecoratorHarness.php         |  3 ---
 .../DefinitionCache/DecoratorTest.php            |  3 ---
 .../DefinitionCache/SerializerTest.php           |  3 ---
 .../HTMLPurifier/DefinitionCacheFactoryTest.php  |  2 --
 tests/HTMLPurifier/DefinitionCacheHarness.php    |  2 --
 tests/HTMLPurifier/DefinitionCacheTest.php       |  2 --
 tests/HTMLPurifier/DefinitionTest.php            |  3 ---
 tests/HTMLPurifier/DoctypeRegistryTest.php       |  2 --
 tests/HTMLPurifier/ElementDefTest.php            |  2 --
 tests/HTMLPurifier/EncoderTest.php               |  2 --
 tests/HTMLPurifier/EntityLookupTest.php          |  2 --
 tests/HTMLPurifier/EntityParserTest.php          |  2 --
 tests/HTMLPurifier/ErrorCollectorEMock.php       |  2 --
 tests/HTMLPurifier/ErrorCollectorTest.php        |  2 --
 tests/HTMLPurifier/ErrorsHarness.php             |  3 ---
 .../Filter/ExtractStyleBlocksTest.php            |  2 --
 tests/HTMLPurifier/GeneratorTest.php             |  5 -----
 tests/HTMLPurifier/HTMLDefinitionTest.php        |  2 --
 tests/HTMLPurifier/HTMLModule/ObjectTest.php     |  2 --
 tests/HTMLPurifier/HTMLModule/RubyTest.php       |  2 --
 tests/HTMLPurifier/HTMLModule/ScriptingTest.php  |  2 --
 tests/HTMLPurifier/HTMLModule/TidyTest.php       |  2 --
 tests/HTMLPurifier/HTMLModuleHarness.php         |  3 ---
 tests/HTMLPurifier/HTMLModuleManagerTest.php     |  2 --
 tests/HTMLPurifier/HTMLModuleTest.php            |  3 ---
 tests/HTMLPurifier/Harness.php                   |  2 --
 tests/HTMLPurifier/IDAccumulatorTest.php         |  2 --
 .../HTMLPurifier/Injector/AutoParagraphTest.php  |  3 ---
 tests/HTMLPurifier/Injector/LinkifyTest.php      |  3 ---
 .../Injector/PurifierLinkifyTest.php             |  3 ---
 tests/HTMLPurifier/InjectorHarness.php           |  3 ---
 tests/HTMLPurifier/LanguageFactoryTest.php       |  2 --
 tests/HTMLPurifier/LanguageTest.php              |  2 --
 tests/HTMLPurifier/Lexer/DirectLexTest.php       |  2 --
 .../HTMLPurifier/Lexer/DirectLex_ErrorsTest.php  |  3 ---
 tests/HTMLPurifier/LexerTest.php                 |  2 --
 tests/HTMLPurifier/PercentEncoderTest.php        |  2 --
 tests/HTMLPurifier/Strategy/CompositeTest.php    |  4 ----
 tests/HTMLPurifier/Strategy/CoreTest.php         |  3 ---
 tests/HTMLPurifier/Strategy/ErrorsHarness.php    |  2 --
 tests/HTMLPurifier/Strategy/FixNestingTest.php   |  3 ---
 .../Strategy/FixNesting_ErrorsTest.php           |  3 ---
 .../HTMLPurifier/Strategy/MakeWellFormedTest.php |  3 ---
 .../Strategy/MakeWellFormed_ErrorsTest.php       |  3 ---
 .../Strategy/MakeWellFormed_InjectorTest.php     |  3 ---
 .../Strategy/RemoveForeignElementsTest.php       |  3 ---
 .../RemoveForeignElements_ErrorsTest.php         |  3 ---
 .../Strategy/RemoveForeignElements_TidyTest.php  |  3 ---
 .../Strategy/ValidateAttributesTest.php          |  3 ---
 .../Strategy/ValidateAttributes_IDTest.php       |  3 ---
 .../Strategy/ValidateAttributes_TidyTest.php     |  3 ---
 tests/HTMLPurifier/StrategyHarness.php           |  2 --
 tests/HTMLPurifier/TagTransformTest.php          |  5 -----
 tests/HTMLPurifier/TokenFactoryTest.php          |  2 --
 tests/HTMLPurifier/TokenTest.php                 |  2 --
 tests/HTMLPurifier/URIDefinitionTest.php         |  3 ---
 .../URIFilter/DisableExternalResourcesTest.php   |  3 ---
 .../URIFilter/DisableExternalTest.php            |  3 ---
 .../HTMLPurifier/URIFilter/HostBlacklistTest.php |  3 ---
 .../HTMLPurifier/URIFilter/MakeAbsoluteTest.php  |  3 ---
 tests/HTMLPurifier/URIFilterHarness.php          |  2 --
 tests/HTMLPurifier/URIHarness.php                |  2 --
 tests/HTMLPurifier/URIParserTest.php             |  3 ---
 tests/HTMLPurifier/URISchemeRegistryTest.php     |  2 --
 tests/HTMLPurifier/URISchemeTest.php             | 13 -------------
 tests/HTMLPurifier/URITest.php                   |  3 ---
 tests/HTMLPurifierTest.php                       |  4 ----
 tests/index.php                                  |  6 ++++--
 136 files changed, 7 insertions(+), 403 deletions(-)

diff --git a/TODO b/TODO
index 61a9a534..a660862b 100644
--- a/TODO
+++ b/TODO
@@ -45,9 +45,7 @@ CONFIGDOC
    which files use what configuration
 
 IF IT AIN'T BROKE...
- - Rename merge-library.php script
  - Create "super" script which performs all regeneration actions
- - Remove all includes from unit tests, and remove blanks/ folder and generation
  - Simplify merge library script by removing recursion? (or other things)
  - Perhaps replace types with integer identifiers in ConfigSchema? (would be
    smaller, but not by much).
diff --git a/maintenance/generate-standalone.php b/maintenance/generate-standalone.php
index 0d60d927..bcd8340a 100755
--- a/maintenance/generate-standalone.php
+++ b/maintenance/generate-standalone.php
@@ -58,21 +58,6 @@ function remove_php_tags($text) {
     return substr($text, 5);
 }
 
-/**
- * Creates an appropriate blank file, recursively generating directories
- * if necessary
- * @param string $file Filename to create blank for
- */
-function create_blank($file) {
-    global $FS;
-    $dir = dirname($file);
-    $base = realpath('../tests/blanks/') . DIRECTORY_SEPARATOR ;
-    if ($dir != '.') {
-        $FS->mkdirr($base . $dir);
-    }
-    file_put_contents($base . $file, '');
-}
-
 /**
  * Copies the contents of a directory to the standalone directory
  * @param string $dir Directory to copy
@@ -120,7 +105,6 @@ function replace_includes_callback($matches) {
     }
     if (isset($GLOBALS['loaded'][$file])) return '';
     $GLOBALS['loaded'][$file] = true;
-    create_blank($file);
     return replace_includes(remove_php_tags(file_get_contents($file)));
 }
 
diff --git a/maintenance/remove-require-once.php b/maintenance/remove-require-once.php
index 98f70c70..6cb4ed71 100644
--- a/maintenance/remove-require-once.php
+++ b/maintenance/remove-require-once.php
@@ -5,8 +5,8 @@ chdir(dirname(__FILE__));
 require_once 'common.php';
 assertCli();
 
-echo "Please do not run this script. It is here for historical purposes only.";
-exit;
+//echo "Please do not run this script. It is here for historical purposes only.";
+//exit;
 
 /**
  * @file
@@ -16,7 +16,7 @@ exit;
  *      This does not remove inline includes; those must be handled manually.
  */
 
-chdir(dirname(__FILE__) . '/../library/');
+chdir(dirname(__FILE__) . '/../tests/HTMLPurifier');
 $FS = new FSTools();
 
 $files = $FS->globr('.', '*.php');
diff --git a/tests/HTMLPurifier/AttrCollectionsTest.php b/tests/HTMLPurifier/AttrCollectionsTest.php
index fb1bb758..eecb03c4 100644
--- a/tests/HTMLPurifier/AttrCollectionsTest.php
+++ b/tests/HTMLPurifier/AttrCollectionsTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrCollections.php';
-
 Mock::generatePartial(
     'HTMLPurifier_AttrCollections',
     'HTMLPurifier_AttrCollections_TestForConstruct',
diff --git a/tests/HTMLPurifier/AttrDef/CSS/AlphaValueTest.php b/tests/HTMLPurifier/AttrDef/CSS/AlphaValueTest.php
index 74fcb494..b24379ed 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/AlphaValueTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/AlphaValueTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_AlphaValueTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php b/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php
index 134df679..d24da1dd 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/BackgroundPositionTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-
 class HTMLPurifier_AttrDef_CSS_BackgroundPositionTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php b/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php
index 7cd60d34..60f06405 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/BackgroundTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/Background.php';
-
 class HTMLPurifier_AttrDef_CSS_BackgroundTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php b/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php
index 5eaceae4..c760dedc 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/BorderTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Border.php';
-
 class HTMLPurifier_AttrDef_CSS_BorderTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php b/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php
index 4cb8602b..b3ac1705 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/ColorTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Color.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_ColorTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php b/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php
index 7a31b342..8b5dc20e 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/CompositeTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_Composite_Testable extends
       HTMLPurifier_AttrDef_CSS_Composite
 {
diff --git a/tests/HTMLPurifier/AttrDef/CSS/FilterTest.php b/tests/HTMLPurifier/AttrDef/CSS/FilterTest.php
index a7aa4817..857adf29 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/FilterTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/FilterTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_FilterTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php b/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php
index 25571128..a717880c 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/FontFamilyTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
-
 class HTMLPurifier_AttrDef_CSS_FontFamilyTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/FontTest.php b/tests/HTMLPurifier/AttrDef/CSS/FontTest.php
index 48650864..2212f428 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/FontTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/FontTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/Font.php';
-
 class HTMLPurifier_AttrDef_CSS_FontTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php b/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php
index d7914e80..bed1ff8e 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/LengthTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Length.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_LengthTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php b/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php
index ff9391a2..313eaf6a 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/ListStyleTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
-
 class HTMLPurifier_AttrDef_CSS_ListStyleTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php b/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php
index 81342a7c..cf9d7448 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/MultipleTest.php
@@ -1,11 +1,6 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 // borrowed for the sakes of this test
-require_once 'HTMLPurifier/AttrDef/Integer.php';
-
 class HTMLPurifier_AttrDef_CSS_MultipleTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php b/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php
index 8aa3ce23..c7e7810a 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/NumberTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Number.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_NumberTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php b/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php
index 3ca210a5..6ecb838f 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/PercentageTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_PercentageTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php b/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php
index fb0ccf4f..30e42a63 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/TextDecorationTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-
 class HTMLPurifier_AttrDef_CSS_TextDecorationTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSS/URITest.php b/tests/HTMLPurifier/AttrDef/CSS/URITest.php
index 97e547c8..bb4035a9 100644
--- a/tests/HTMLPurifier/AttrDef/CSS/URITest.php
+++ b/tests/HTMLPurifier/AttrDef/CSS/URITest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS/URI.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSS_URITest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/CSSTest.php b/tests/HTMLPurifier/AttrDef/CSSTest.php
index a4ffc50c..bf940bfb 100644
--- a/tests/HTMLPurifier/AttrDef/CSSTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSSTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/CSS.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_CSSTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/EnumTest.php b/tests/HTMLPurifier/AttrDef/EnumTest.php
index 013b660d..c6c02348 100644
--- a/tests/HTMLPurifier/AttrDef/EnumTest.php
+++ b/tests/HTMLPurifier/AttrDef/EnumTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/Enum.php';
-
 class HTMLPurifier_AttrDef_EnumTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php b/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php
index 87e8a8eb..9dfd2962 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/BoolTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Bool.php';
-
 class HTMLPurifier_AttrDef_HTML_BoolTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php b/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php
index 72f6c90f..f31b5b3c 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/ColorTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Color.php';
-
 class HTMLPurifier_AttrDef_HTML_ColorTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php b/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php
index 11353336..2284cb40 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/FrameTargetTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-
 class HTMLPurifier_AttrDef_HTML_FrameTargetTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/IDTest.php b/tests/HTMLPurifier/AttrDef/HTML/IDTest.php
index dda0db41..6d0d3bc4 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/IDTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/IDTest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/ID.php';
-require_once 'HTMLPurifier/IDAccumulator.php';
-
 class HTMLPurifier_AttrDef_HTML_IDTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php b/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php
index 8fba0476..4bd5efec 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/LengthTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/HTML/PixelsTest.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Length.php';
-
 class HTMLPurifier_AttrDef_HTML_LengthTest extends HTMLPurifier_AttrDef_HTML_PixelsTest
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php b/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php
index a6643f74..aafeee44 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/LinkTypesTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-
 class HTMLPurifier_AttrDef_HTML_LinkTypesTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php b/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php
index 7a305c30..4fd3da76 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/MultiLengthTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/HTML/LengthTest.php';
-require_once 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
-
 class HTMLPurifier_AttrDef_HTML_MultiLengthTest extends HTMLPurifier_AttrDef_HTML_LengthTest
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php b/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php
index 3d218061..df4032b3 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/NmtokensTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-
 class HTMLPurifier_AttrDef_HTML_NmtokensTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php b/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php
index 6fa899bf..582215b4 100644
--- a/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML/PixelsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/HTML/Pixels.php';
-
 class HTMLPurifier_AttrDef_HTML_PixelsTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/IntegerTest.php b/tests/HTMLPurifier/AttrDef/IntegerTest.php
index 43714d8e..23503955 100644
--- a/tests/HTMLPurifier/AttrDef/IntegerTest.php
+++ b/tests/HTMLPurifier/AttrDef/IntegerTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/Integer.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_IntegerTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/LangTest.php b/tests/HTMLPurifier/AttrDef/LangTest.php
index cafa5db2..89372a17 100644
--- a/tests/HTMLPurifier/AttrDef/LangTest.php
+++ b/tests/HTMLPurifier/AttrDef/LangTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/Lang.php';
-
 class HTMLPurifier_AttrDef_LangTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/TextTest.php b/tests/HTMLPurifier/AttrDef/TextTest.php
index 4977edcd..59b42465 100644
--- a/tests/HTMLPurifier/AttrDef/TextTest.php
+++ b/tests/HTMLPurifier/AttrDef/TextTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/Text.php';
-
 class HTMLPurifier_AttrDef_TextTest extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php b/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php
index 6b8cae31..d1ea814d 100644
--- a/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php
+++ b/tests/HTMLPurifier/AttrDef/URI/Email/SimpleCheckTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once 'HTMLPurifier/AttrDef/URI/EmailHarness.php';
-
 class HTMLPurifier_AttrDef_URI_Email_SimpleCheckTest
     extends HTMLPurifier_AttrDef_URI_EmailHarness
 {
diff --git a/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php b/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php
index 3c14e4eb..cf410a21 100644
--- a/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php
+++ b/tests/HTMLPurifier/AttrDef/URI/EmailHarness.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/URI/Email.php';
-require_once 'HTMLPurifier/AttrDefHarness.php';
-
 class HTMLPurifier_AttrDef_URI_EmailHarness extends HTMLPurifier_AttrDefHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrDef/URI/HostTest.php b/tests/HTMLPurifier/AttrDef/URI/HostTest.php
index 33424eca..b05276da 100644
--- a/tests/HTMLPurifier/AttrDef/URI/HostTest.php
+++ b/tests/HTMLPurifier/AttrDef/URI/HostTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI/Host.php';
-
 // takes a URI formatted host and validates it
 
 
diff --git a/tests/HTMLPurifier/AttrDef/URI/IPv4Test.php b/tests/HTMLPurifier/AttrDef/URI/IPv4Test.php
index aa05159c..c4022b83 100644
--- a/tests/HTMLPurifier/AttrDef/URI/IPv4Test.php
+++ b/tests/HTMLPurifier/AttrDef/URI/IPv4Test.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI/IPv4.php';
-
 // IPv4 test case is spliced from Feyd's IPv6 implementation
 // we ought to disallow non-routable addresses
 
diff --git a/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php b/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php
index 33b56ad4..0fc17a00 100644
--- a/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php
+++ b/tests/HTMLPurifier/AttrDef/URI/IPv6Test.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI/IPv6.php';
-
 // test case is from Feyd's IPv6 implementation
 // we ought to disallow non-routable addresses
 
diff --git a/tests/HTMLPurifier/AttrDef/URITest.php b/tests/HTMLPurifier/AttrDef/URITest.php
index 58b77248..f0b401da 100644
--- a/tests/HTMLPurifier/AttrDef/URITest.php
+++ b/tests/HTMLPurifier/AttrDef/URITest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDefHarness.php';
-require_once 'HTMLPurifier/AttrDef/URI.php';
-require_once 'HTMLPurifier/URIParser.php';
-
 /**
  * @todo Aim for complete code coverage with mocks
  */
diff --git a/tests/HTMLPurifier/AttrDefTest.php b/tests/HTMLPurifier/AttrDefTest.php
index 33d1e0b3..dc165971 100644
--- a/tests/HTMLPurifier/AttrDefTest.php
+++ b/tests/HTMLPurifier/AttrDefTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef.php';
-
 Mock::generatePartial(
         'HTMLPurifier_AttrDef',
         'HTMLPurifier_AttrDefTestable',
diff --git a/tests/HTMLPurifier/AttrTransform/BdoDirTest.php b/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
index 631e019c..15270d1d 100644
--- a/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/BdoDir.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_BdoDirTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/BgColorTest.php b/tests/HTMLPurifier/AttrTransform/BgColorTest.php
index ac46a312..c539a4a5 100644
--- a/tests/HTMLPurifier/AttrTransform/BgColorTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BgColorTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/BgColor.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 // we currently rely on the CSS validator to fix any problems.
 // This means that this transform, strictly speaking, supports
 // a superset of the functionality.
diff --git a/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php b/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php
index 6c6ce40b..aefde3e2 100644
--- a/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_BoolToCSSTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/BorderTest.php b/tests/HTMLPurifier/AttrTransform/BorderTest.php
index a89c3b3d..903dda7f 100644
--- a/tests/HTMLPurifier/AttrTransform/BorderTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BorderTest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/Border.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
-
 class HTMLPurifier_AttrTransform_BorderTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php b/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php
index 6bb013f0..dc0655bb 100644
--- a/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php
+++ b/tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_EnumToCSSTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php b/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
index 5746f8d6..96488024 100644
--- a/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
+++ b/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_ImgRequiredTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php b/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php
index a40fc32c..28dd2a58 100644
--- a/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php
+++ b/tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
-
 class HTMLPurifier_AttrTransform_ImgSpaceTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/LangTest.php b/tests/HTMLPurifier/AttrTransform/LangTest.php
index 89ae84be..9cb16ef6 100644
--- a/tests/HTMLPurifier/AttrTransform/LangTest.php
+++ b/tests/HTMLPurifier/AttrTransform/LangTest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Token.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-require_once 'HTMLPurifier/AttrTransform/Lang.php';
-
 class HTMLPurifier_AttrTransform_LangTest
     extends HTMLPurifier_AttrTransformHarness
 {
diff --git a/tests/HTMLPurifier/AttrTransform/LengthTest.php b/tests/HTMLPurifier/AttrTransform/LengthTest.php
index 8d2265f3..2c66fb48 100644
--- a/tests/HTMLPurifier/AttrTransform/LengthTest.php
+++ b/tests/HTMLPurifier/AttrTransform/LengthTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/Length.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_LengthTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransform/NameTest.php b/tests/HTMLPurifier/AttrTransform/NameTest.php
index fef690d1..c6278deb 100644
--- a/tests/HTMLPurifier/AttrTransform/NameTest.php
+++ b/tests/HTMLPurifier/AttrTransform/NameTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform/Name.php';
-require_once 'HTMLPurifier/AttrTransformHarness.php';
-
 class HTMLPurifier_AttrTransform_NameTest extends HTMLPurifier_AttrTransformHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransformHarness.php b/tests/HTMLPurifier/AttrTransformHarness.php
index 0aa13a53..df6e1979 100644
--- a/tests/HTMLPurifier/AttrTransformHarness.php
+++ b/tests/HTMLPurifier/AttrTransformHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ComplexHarness.php';
-
 class HTMLPurifier_AttrTransformHarness extends HTMLPurifier_ComplexHarness
 {
     
diff --git a/tests/HTMLPurifier/AttrTransformTest.php b/tests/HTMLPurifier/AttrTransformTest.php
index 911272ac..2a9ed41f 100644
--- a/tests/HTMLPurifier/AttrTransformTest.php
+++ b/tests/HTMLPurifier/AttrTransformTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTransform.php';
-
 Mock::generatePartial(
         'HTMLPurifier_AttrTransform',
         'HTMLPurifier_AttrTransformTestable',
diff --git a/tests/HTMLPurifier/AttrTypesTest.php b/tests/HTMLPurifier/AttrTypesTest.php
index c207c320..b1c8a3f7 100644
--- a/tests/HTMLPurifier/AttrTypesTest.php
+++ b/tests/HTMLPurifier/AttrTypesTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrTypes.php';
-
 class HTMLPurifier_AttrTypesTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/AttrValidator_ErrorsTest.php b/tests/HTMLPurifier/AttrValidator_ErrorsTest.php
index 8371962b..935b427a 100644
--- a/tests/HTMLPurifier/AttrValidator_ErrorsTest.php
+++ b/tests/HTMLPurifier/AttrValidator_ErrorsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorsHarness.php';
-require_once 'HTMLPurifier/AttrValidator.php';
-
 class HTMLPurifier_AttrValidator_ErrorsTest extends HTMLPurifier_ErrorsHarness
 {
     
diff --git a/tests/HTMLPurifier/ChildDef/ChameleonTest.php b/tests/HTMLPurifier/ChildDef/ChameleonTest.php
index 967d29c0..093bc2ed 100644
--- a/tests/HTMLPurifier/ChildDef/ChameleonTest.php
+++ b/tests/HTMLPurifier/ChildDef/ChameleonTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Chameleon.php';
-
 class HTMLPurifier_ChildDef_ChameleonTest extends HTMLPurifier_ChildDefHarness
 {
     
diff --git a/tests/HTMLPurifier/ChildDef/CustomTest.php b/tests/HTMLPurifier/ChildDef/CustomTest.php
index 2b33f7cf..4cb088de 100644
--- a/tests/HTMLPurifier/ChildDef/CustomTest.php
+++ b/tests/HTMLPurifier/ChildDef/CustomTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Custom.php';
-
 class HTMLPurifier_ChildDef_CustomTest extends HTMLPurifier_ChildDefHarness
 {
     
diff --git a/tests/HTMLPurifier/ChildDef/OptionalTest.php b/tests/HTMLPurifier/ChildDef/OptionalTest.php
index 40dc17ee..ecbc5927 100644
--- a/tests/HTMLPurifier/ChildDef/OptionalTest.php
+++ b/tests/HTMLPurifier/ChildDef/OptionalTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Optional.php';
-
 class HTMLPurifier_ChildDef_OptionalTest extends HTMLPurifier_ChildDefHarness
 {
     
diff --git a/tests/HTMLPurifier/ChildDef/RequiredTest.php b/tests/HTMLPurifier/ChildDef/RequiredTest.php
index f2b55bae..4215cb02 100644
--- a/tests/HTMLPurifier/ChildDef/RequiredTest.php
+++ b/tests/HTMLPurifier/ChildDef/RequiredTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Required.php';
-
 class HTMLPurifier_ChildDef_RequiredTest extends HTMLPurifier_ChildDefHarness
 {
     
diff --git a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
index e55f96e5..53462046 100644
--- a/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
+++ b/tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/StrictBlockquote.php';
-
 class   HTMLPurifier_ChildDef_StrictBlockquoteTest
 extends HTMLPurifier_ChildDefHarness
 {
diff --git a/tests/HTMLPurifier/ChildDef/TableTest.php b/tests/HTMLPurifier/ChildDef/TableTest.php
index 62247d23..fca90d87 100644
--- a/tests/HTMLPurifier/ChildDef/TableTest.php
+++ b/tests/HTMLPurifier/ChildDef/TableTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ChildDefHarness.php';
-require_once 'HTMLPurifier/ChildDef/Table.php';
-
 // we're using empty tags to compact the tests: under real circumstances
 // there would be contents in them
 
diff --git a/tests/HTMLPurifier/ChildDefHarness.php b/tests/HTMLPurifier/ChildDefHarness.php
index 0650c2d0..5e098ff7 100644
--- a/tests/HTMLPurifier/ChildDefHarness.php
+++ b/tests/HTMLPurifier/ChildDefHarness.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ComplexHarness.php';
-require_once 'HTMLPurifier/ChildDef.php';
-
 class HTMLPurifier_ChildDefHarness extends HTMLPurifier_ComplexHarness
 {
     
diff --git a/tests/HTMLPurifier/ComplexHarness.php b/tests/HTMLPurifier/ComplexHarness.php
index 6e930d87..e4fc694f 100644
--- a/tests/HTMLPurifier/ComplexHarness.php
+++ b/tests/HTMLPurifier/ComplexHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 /**
  * General-purpose test-harness that makes testing functions that require
  * configuration and context objects easier when those two parameters are
diff --git a/tests/HTMLPurifier/ConfigSchemaTest.php b/tests/HTMLPurifier/ConfigSchemaTest.php
index d785fa60..49abf145 100644
--- a/tests/HTMLPurifier/ConfigSchemaTest.php
+++ b/tests/HTMLPurifier/ConfigSchemaTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ConfigSchema.php';
-
 class HTMLPurifier_ConfigSchemaTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/ConfigTest.php b/tests/HTMLPurifier/ConfigTest.php
index 19f75e32..96bf3cfc 100644
--- a/tests/HTMLPurifier/ConfigTest.php
+++ b/tests/HTMLPurifier/ConfigTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Config.php';
-
 class HTMLPurifier_ConfigTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/ContextTest.php b/tests/HTMLPurifier/ContextTest.php
index 397188ac..bf4a1544 100644
--- a/tests/HTMLPurifier/ContextTest.php
+++ b/tests/HTMLPurifier/ContextTest.php
@@ -1,10 +1,6 @@
 <?php
 
-require_once 'HTMLPurifier/Context.php';
-
 // mocks
-require_once 'HTMLPurifier/IDAccumulator.php';
-
 class HTMLPurifier_ContextTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php b/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php
index dc60752a..eb847e92 100644
--- a/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/Decorator/CleanupTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCache/DecoratorHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-
 generate_mock_once('HTMLPurifier_DefinitionCache');
 
 class HTMLPurifier_DefinitionCache_Decorator_CleanupTest extends HTMLPurifier_DefinitionCache_DecoratorHarness
diff --git a/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php b/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php
index cba780fb..6f78254f 100644
--- a/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/Decorator/MemoryTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCache/DecoratorHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-
 generate_mock_once('HTMLPurifier_DefinitionCache');
 
 class HTMLPurifier_DefinitionCache_Decorator_MemoryTest extends HTMLPurifier_DefinitionCache_DecoratorHarness
diff --git a/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php b/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php
index 78c753a3..f827e46e 100644
--- a/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php
+++ b/tests/HTMLPurifier/DefinitionCache/DecoratorHarness.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-
 generate_mock_once('HTMLPurifier_DefinitionCache');
 
 class HTMLPurifier_DefinitionCache_DecoratorHarness extends HTMLPurifier_DefinitionCacheHarness
diff --git a/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php b/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php
index 1390d543..c83abe40 100644
--- a/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/DecoratorTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
-
 class HTMLPurifier_DefinitionCache_DecoratorTest extends HTMLPurifier_DefinitionCacheHarness
 {
     
diff --git a/tests/HTMLPurifier/DefinitionCache/SerializerTest.php b/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
index 7c7b9f22..446bfc85 100644
--- a/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheHarness.php';
-require_once 'HTMLPurifier/DefinitionCache/Serializer.php';
-
 class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_DefinitionCacheHarness
 {
     
diff --git a/tests/HTMLPurifier/DefinitionCacheFactoryTest.php b/tests/HTMLPurifier/DefinitionCacheFactoryTest.php
index d2585be1..a2441fc4 100644
--- a/tests/HTMLPurifier/DefinitionCacheFactoryTest.php
+++ b/tests/HTMLPurifier/DefinitionCacheFactoryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCacheFactory.php';
-
 class HTMLPurifier_DefinitionCacheFactoryTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/DefinitionCacheHarness.php b/tests/HTMLPurifier/DefinitionCacheHarness.php
index 0e09cec1..280a3276 100644
--- a/tests/HTMLPurifier/DefinitionCacheHarness.php
+++ b/tests/HTMLPurifier/DefinitionCacheHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionTestable.php';
-
 class HTMLPurifier_DefinitionCacheHarness extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/DefinitionCacheTest.php b/tests/HTMLPurifier/DefinitionCacheTest.php
index 3c68d049..aac6ebf6 100644
--- a/tests/HTMLPurifier/DefinitionCacheTest.php
+++ b/tests/HTMLPurifier/DefinitionCacheTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DefinitionCache.php';
-
 class HTMLPurifier_DefinitionCacheTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/DefinitionTest.php b/tests/HTMLPurifier/DefinitionTest.php
index d30fd47d..d1ca62da 100644
--- a/tests/HTMLPurifier/DefinitionTest.php
+++ b/tests/HTMLPurifier/DefinitionTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Definition.php';
-require_once 'HTMLPurifier/DefinitionTestable.php';
-
 class HTMLPurifier_DefinitionTest extends HTMLPurifier_Harness
 {
     function test_setup() {
diff --git a/tests/HTMLPurifier/DoctypeRegistryTest.php b/tests/HTMLPurifier/DoctypeRegistryTest.php
index cec9dfcd..78b8a7fb 100644
--- a/tests/HTMLPurifier/DoctypeRegistryTest.php
+++ b/tests/HTMLPurifier/DoctypeRegistryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/DoctypeRegistry.php';
-
 class HTMLPurifier_DoctypeRegistryTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/ElementDefTest.php b/tests/HTMLPurifier/ElementDefTest.php
index a947b4c4..fd85f6f8 100644
--- a/tests/HTMLPurifier/ElementDefTest.php
+++ b/tests/HTMLPurifier/ElementDefTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ElementDef.php';
-
 class HTMLPurifier_ElementDefTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/EncoderTest.php b/tests/HTMLPurifier/EncoderTest.php
index 8af0e66d..2d648db8 100644
--- a/tests/HTMLPurifier/EncoderTest.php
+++ b/tests/HTMLPurifier/EncoderTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Encoder.php';
-
 class HTMLPurifier_EncoderTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/EntityLookupTest.php b/tests/HTMLPurifier/EntityLookupTest.php
index 5b031503..0e25d9bf 100644
--- a/tests/HTMLPurifier/EntityLookupTest.php
+++ b/tests/HTMLPurifier/EntityLookupTest.php
@@ -2,8 +2,6 @@
 
 // this page is UTF-8 encoded!
 
-require_once 'HTMLPurifier/EntityLookup.php';
-
 class HTMLPurifier_EntityLookupTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/EntityParserTest.php b/tests/HTMLPurifier/EntityParserTest.php
index e41006ce..dd3b38d1 100644
--- a/tests/HTMLPurifier/EntityParserTest.php
+++ b/tests/HTMLPurifier/EntityParserTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/EntityParser.php';
-
 class HTMLPurifier_EntityParserTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/ErrorCollectorEMock.php b/tests/HTMLPurifier/ErrorCollectorEMock.php
index 35ef0173..8457b764 100644
--- a/tests/HTMLPurifier/ErrorCollectorEMock.php
+++ b/tests/HTMLPurifier/ErrorCollectorEMock.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorCollector.php';
-
 generate_mock_once('HTMLPurifier_ErrorCollector');
 
 /**
diff --git a/tests/HTMLPurifier/ErrorCollectorTest.php b/tests/HTMLPurifier/ErrorCollectorTest.php
index 0c8db720..979e1f0f 100644
--- a/tests/HTMLPurifier/ErrorCollectorTest.php
+++ b/tests/HTMLPurifier/ErrorCollectorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorCollector.php';
-
 class HTMLPurifier_ErrorCollectorTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/ErrorsHarness.php b/tests/HTMLPurifier/ErrorsHarness.php
index de05de15..b66f2217 100644
--- a/tests/HTMLPurifier/ErrorsHarness.php
+++ b/tests/HTMLPurifier/ErrorsHarness.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorCollectorEMock.php';
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 /**
  * @todo Make the callCount variable actually work, so we can precisely
  *       specify what errors we want: no more, no less
diff --git a/tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php b/tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php
index 2dd99be8..f1c3dafb 100644
--- a/tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php
+++ b/tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Filter/ExtractStyleBlocks.php';
-
 /**
  * @todo Assimilate CSSTidy into our library
  */
diff --git a/tests/HTMLPurifier/GeneratorTest.php b/tests/HTMLPurifier/GeneratorTest.php
index ffac8cd1..325d14cb 100644
--- a/tests/HTMLPurifier/GeneratorTest.php
+++ b/tests/HTMLPurifier/GeneratorTest.php
@@ -1,10 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Generator.php';
-require_once 'HTMLPurifier/EntityLookup.php';
-
-require_once 'HTMLPurifier/ComplexHarness.php';
-
 class HTMLPurifier_GeneratorTest extends HTMLPurifier_ComplexHarness
 {
     
diff --git a/tests/HTMLPurifier/HTMLDefinitionTest.php b/tests/HTMLPurifier/HTMLDefinitionTest.php
index 28fb28cc..b2a03ef9 100644
--- a/tests/HTMLPurifier/HTMLDefinitionTest.php
+++ b/tests/HTMLPurifier/HTMLDefinitionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLDefinition.php';
-
 class HTMLPurifier_HTMLDefinitionTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/HTMLModule/ObjectTest.php b/tests/HTMLPurifier/HTMLModule/ObjectTest.php
index 44e1ffa5..12d9b0a4 100644
--- a/tests/HTMLPurifier/HTMLModule/ObjectTest.php
+++ b/tests/HTMLPurifier/HTMLModule/ObjectTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleHarness.php';
-
 class HTMLPurifier_HTMLModule_ObjectTest extends HTMLPurifier_HTMLModuleHarness
 {
     
diff --git a/tests/HTMLPurifier/HTMLModule/RubyTest.php b/tests/HTMLPurifier/HTMLModule/RubyTest.php
index 15abbcb7..5b13b72c 100644
--- a/tests/HTMLPurifier/HTMLModule/RubyTest.php
+++ b/tests/HTMLPurifier/HTMLModule/RubyTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleHarness.php';
-
 class HTMLPurifier_HTMLModule_RubyTest extends HTMLPurifier_HTMLModuleHarness
 {
     
diff --git a/tests/HTMLPurifier/HTMLModule/ScriptingTest.php b/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
index 7f4151fd..a6e10b48 100644
--- a/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
+++ b/tests/HTMLPurifier/HTMLModule/ScriptingTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleHarness.php';
-
 class HTMLPurifier_HTMLModule_ScriptingTest extends HTMLPurifier_HTMLModuleHarness
 {
     
diff --git a/tests/HTMLPurifier/HTMLModule/TidyTest.php b/tests/HTMLPurifier/HTMLModule/TidyTest.php
index f2522d9d..66824f69 100644
--- a/tests/HTMLPurifier/HTMLModule/TidyTest.php
+++ b/tests/HTMLPurifier/HTMLModule/TidyTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModule/Tidy.php';
-
 Mock::generatePartial(
     'HTMLPurifier_HTMLModule_Tidy',
     'HTMLPurifier_HTMLModule_Tidy_TestForConstruct',
diff --git a/tests/HTMLPurifier/HTMLModuleHarness.php b/tests/HTMLPurifier/HTMLModuleHarness.php
index 8ca2df33..f9052965 100644
--- a/tests/HTMLPurifier/HTMLModuleHarness.php
+++ b/tests/HTMLPurifier/HTMLModuleHarness.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/Core.php';
-
 class HTMLPurifier_HTMLModuleHarness extends HTMLPurifier_StrategyHarness
 {
     function setup() {
diff --git a/tests/HTMLPurifier/HTMLModuleManagerTest.php b/tests/HTMLPurifier/HTMLModuleManagerTest.php
index 9367f76d..f6eee019 100644
--- a/tests/HTMLPurifier/HTMLModuleManagerTest.php
+++ b/tests/HTMLPurifier/HTMLModuleManagerTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModuleManager.php';
-
 class HTMLPurifier_HTMLModuleManagerTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/HTMLModuleTest.php b/tests/HTMLPurifier/HTMLModuleTest.php
index ace5805f..06d7cdd8 100644
--- a/tests/HTMLPurifier/HTMLModuleTest.php
+++ b/tests/HTMLPurifier/HTMLModuleTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/HTMLModule.php';
-require_once 'HTMLPurifier/AttrDef.php';
-
 class HTMLPurifier_HTMLModuleTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/Harness.php b/tests/HTMLPurifier/Harness.php
index 34164bc7..d616320e 100644
--- a/tests/HTMLPurifier/Harness.php
+++ b/tests/HTMLPurifier/Harness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIParser.php';
-
 /**
  * All-use harness, use this rather than SimpleTest's
  */
diff --git a/tests/HTMLPurifier/IDAccumulatorTest.php b/tests/HTMLPurifier/IDAccumulatorTest.php
index c6249eca..f173f45d 100644
--- a/tests/HTMLPurifier/IDAccumulatorTest.php
+++ b/tests/HTMLPurifier/IDAccumulatorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/IDAccumulator.php';
-
 class HTMLPurifier_IDAccumulatorTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/Injector/AutoParagraphTest.php b/tests/HTMLPurifier/Injector/AutoParagraphTest.php
index 5c726a11..d708ed78 100644
--- a/tests/HTMLPurifier/Injector/AutoParagraphTest.php
+++ b/tests/HTMLPurifier/Injector/AutoParagraphTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/InjectorHarness.php';
-require_once 'HTMLPurifier/Injector/AutoParagraph.php';
-
 class HTMLPurifier_Injector_AutoParagraphTest extends HTMLPurifier_InjectorHarness
 {
     
diff --git a/tests/HTMLPurifier/Injector/LinkifyTest.php b/tests/HTMLPurifier/Injector/LinkifyTest.php
index 777cac9a..0ae884a6 100644
--- a/tests/HTMLPurifier/Injector/LinkifyTest.php
+++ b/tests/HTMLPurifier/Injector/LinkifyTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/InjectorHarness.php';
-require_once 'HTMLPurifier/Injector/Linkify.php';
-
 class HTMLPurifier_Injector_LinkifyTest extends HTMLPurifier_InjectorHarness
 {
     
diff --git a/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php b/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php
index 309733f3..f4e811e2 100644
--- a/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php
+++ b/tests/HTMLPurifier/Injector/PurifierLinkifyTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/InjectorHarness.php';
-require_once 'HTMLPurifier/Injector/PurifierLinkify.php';
-
 class HTMLPurifier_Injector_PurifierLinkifyTest extends HTMLPurifier_InjectorHarness
 {
     
diff --git a/tests/HTMLPurifier/InjectorHarness.php b/tests/HTMLPurifier/InjectorHarness.php
index 1b20b126..01cd3271 100644
--- a/tests/HTMLPurifier/InjectorHarness.php
+++ b/tests/HTMLPurifier/InjectorHarness.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
-
 class HTMLPurifier_InjectorHarness extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/LanguageFactoryTest.php b/tests/HTMLPurifier/LanguageFactoryTest.php
index 2cadb1c1..d7c1b38c 100644
--- a/tests/HTMLPurifier/LanguageFactoryTest.php
+++ b/tests/HTMLPurifier/LanguageFactoryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/LanguageFactory.php';
-
 class HTMLPurifier_LanguageFactoryTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/LanguageTest.php b/tests/HTMLPurifier/LanguageTest.php
index d31a2734..10b8ff88 100644
--- a/tests/HTMLPurifier/LanguageTest.php
+++ b/tests/HTMLPurifier/LanguageTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Language.php';
-
 /** 
  * @todo Fix usage of HTMLPurifier_Language->_loaded using something else
  */
diff --git a/tests/HTMLPurifier/Lexer/DirectLexTest.php b/tests/HTMLPurifier/Lexer/DirectLexTest.php
index 4a149548..d39438d8 100644
--- a/tests/HTMLPurifier/Lexer/DirectLexTest.php
+++ b/tests/HTMLPurifier/Lexer/DirectLexTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 class HTMLPurifier_Lexer_DirectLexTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php b/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
index ad048d2d..31951a34 100644
--- a/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
+++ b/tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorsHarness.php';
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 class HTMLPurifier_Lexer_DirectLex_ErrorsTest extends HTMLPurifier_ErrorsHarness
 {
     
diff --git a/tests/HTMLPurifier/LexerTest.php b/tests/HTMLPurifier/LexerTest.php
index ec24b431..c1f05e57 100644
--- a/tests/HTMLPurifier/LexerTest.php
+++ b/tests/HTMLPurifier/LexerTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Lexer/DirectLex.php';
-
 class HTMLPurifier_LexerTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/PercentEncoderTest.php b/tests/HTMLPurifier/PercentEncoderTest.php
index 1f5c9813..b77875fc 100644
--- a/tests/HTMLPurifier/PercentEncoderTest.php
+++ b/tests/HTMLPurifier/PercentEncoderTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/PercentEncoder.php';
-
 class HTMLPurifier_PercentEncoderTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/CompositeTest.php b/tests/HTMLPurifier/Strategy/CompositeTest.php
index 9ee42e30..34bb214c 100644
--- a/tests/HTMLPurifier/Strategy/CompositeTest.php
+++ b/tests/HTMLPurifier/Strategy/CompositeTest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Strategy.php';
-require_once 'HTMLPurifier/Strategy/Composite.php';
-require_once 'HTMLPurifier/Config.php';
-
 class HTMLPurifier_Strategy_Composite_Test
     extends HTMLPurifier_Strategy_Composite
 {
diff --git a/tests/HTMLPurifier/Strategy/CoreTest.php b/tests/HTMLPurifier/Strategy/CoreTest.php
index 8b4e745f..d5f9e27e 100644
--- a/tests/HTMLPurifier/Strategy/CoreTest.php
+++ b/tests/HTMLPurifier/Strategy/CoreTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/Core.php';
-
 class HTMLPurifier_Strategy_CoreTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/ErrorsHarness.php b/tests/HTMLPurifier/Strategy/ErrorsHarness.php
index 97b6475a..dedacc17 100644
--- a/tests/HTMLPurifier/Strategy/ErrorsHarness.php
+++ b/tests/HTMLPurifier/Strategy/ErrorsHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ErrorsHarness.php';
-
 class HTMLPurifier_Strategy_ErrorsHarness extends HTMLPurifier_ErrorsHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/FixNestingTest.php b/tests/HTMLPurifier/Strategy/FixNestingTest.php
index bf4c374d..a381ce22 100644
--- a/tests/HTMLPurifier/Strategy/FixNestingTest.php
+++ b/tests/HTMLPurifier/Strategy/FixNestingTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/FixNesting.php';
-
 class HTMLPurifier_Strategy_FixNestingTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php b/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php
index db5b989f..38503466 100644
--- a/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php
+++ b/tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Strategy/ErrorsHarness.php';
-require_once 'HTMLPurifier/Strategy/FixNesting.php';
-
 class HTMLPurifier_Strategy_FixNesting_ErrorsTest extends HTMLPurifier_Strategy_ErrorsHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php b/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php
index 4f5df04e..44184c3b 100644
--- a/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php
+++ b/tests/HTMLPurifier/Strategy/MakeWellFormedTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
-
 class HTMLPurifier_Strategy_MakeWellFormedTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php b/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php
index da201106..edeff4ab 100644
--- a/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php
+++ b/tests/HTMLPurifier/Strategy/MakeWellFormed_ErrorsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Strategy/ErrorsHarness.php';
-require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
-
 class HTMLPurifier_Strategy_MakeWellFormed_ErrorsTest extends HTMLPurifier_Strategy_ErrorsHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/MakeWellFormed_InjectorTest.php b/tests/HTMLPurifier/Strategy/MakeWellFormed_InjectorTest.php
index 25dbf42c..3782c04a 100644
--- a/tests/HTMLPurifier/Strategy/MakeWellFormed_InjectorTest.php
+++ b/tests/HTMLPurifier/Strategy/MakeWellFormed_InjectorTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/MakeWellFormed.php';
-
 class HTMLPurifier_Strategy_MakeWellFormed_InjectorTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php b/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php
index 4b397b09..4c4c9de7 100644
--- a/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php
+++ b/tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-
 class HTMLPurifier_Strategy_RemoveForeignElementsTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php b/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php
index 5843b722..0726be47 100644
--- a/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php
+++ b/tests/HTMLPurifier/Strategy/RemoveForeignElements_ErrorsTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Strategy/ErrorsHarness.php';
-require_once 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-
 class HTMLPurifier_Strategy_RemoveForeignElements_ErrorsTest extends HTMLPurifier_Strategy_ErrorsHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/RemoveForeignElements_TidyTest.php b/tests/HTMLPurifier/Strategy/RemoveForeignElements_TidyTest.php
index 8071d2ab..57957080 100644
--- a/tests/HTMLPurifier/Strategy/RemoveForeignElements_TidyTest.php
+++ b/tests/HTMLPurifier/Strategy/RemoveForeignElements_TidyTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/StrategyHarness.php';
-require_once 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-
 class HTMLPurifier_Strategy_RemoveForeignElements_TidyTest
   extends HTMLPurifier_StrategyHarness
 {
diff --git a/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php b/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
index 25359425..72303a2c 100644
--- a/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
+++ b/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once('HTMLPurifier/StrategyHarness.php');
-require_once('HTMLPurifier/Strategy/ValidateAttributes.php');
-
 class HTMLPurifier_Strategy_ValidateAttributesTest extends
       HTMLPurifier_StrategyHarness
 {
diff --git a/tests/HTMLPurifier/Strategy/ValidateAttributes_IDTest.php b/tests/HTMLPurifier/Strategy/ValidateAttributes_IDTest.php
index d73b0ebd..f90a7158 100644
--- a/tests/HTMLPurifier/Strategy/ValidateAttributes_IDTest.php
+++ b/tests/HTMLPurifier/Strategy/ValidateAttributes_IDTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once('HTMLPurifier/StrategyHarness.php');
-require_once('HTMLPurifier/Strategy/ValidateAttributes.php');
-
 class HTMLPurifier_Strategy_ValidateAttributes_IDTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/Strategy/ValidateAttributes_TidyTest.php b/tests/HTMLPurifier/Strategy/ValidateAttributes_TidyTest.php
index 1f0e21ba..928e093a 100644
--- a/tests/HTMLPurifier/Strategy/ValidateAttributes_TidyTest.php
+++ b/tests/HTMLPurifier/Strategy/ValidateAttributes_TidyTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once('HTMLPurifier/StrategyHarness.php');
-require_once('HTMLPurifier/Strategy/ValidateAttributes.php');
-
 class HTMLPurifier_Strategy_ValidateAttributes_TidyTest extends HTMLPurifier_StrategyHarness
 {
     
diff --git a/tests/HTMLPurifier/StrategyHarness.php b/tests/HTMLPurifier/StrategyHarness.php
index fe20b646..0e55dbf6 100644
--- a/tests/HTMLPurifier/StrategyHarness.php
+++ b/tests/HTMLPurifier/StrategyHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/ComplexHarness.php';
-
 class HTMLPurifier_StrategyHarness extends HTMLPurifier_ComplexHarness
 {
     
diff --git a/tests/HTMLPurifier/TagTransformTest.php b/tests/HTMLPurifier/TagTransformTest.php
index 92b28fb0..201b9218 100644
--- a/tests/HTMLPurifier/TagTransformTest.php
+++ b/tests/HTMLPurifier/TagTransformTest.php
@@ -1,11 +1,6 @@
 <?php
 
-require_once 'HTMLPurifier/TagTransform.php';
-
 // needs to be seperated into files
-require_once 'HTMLPurifier/TagTransform/Font.php';
-require_once 'HTMLPurifier/TagTransform/Simple.php';
-
 class HTMLPurifier_TagTransformTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/TokenFactoryTest.php b/tests/HTMLPurifier/TokenFactoryTest.php
index 54be5305..376fba0b 100644
--- a/tests/HTMLPurifier/TokenFactoryTest.php
+++ b/tests/HTMLPurifier/TokenFactoryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/TokenFactory.php';
-
 class HTMLPurifier_TokenFactoryTest extends HTMLPurifier_Harness
 {
     public function test() {
diff --git a/tests/HTMLPurifier/TokenTest.php b/tests/HTMLPurifier/TokenTest.php
index 2f440ff9..c89b7c1b 100644
--- a/tests/HTMLPurifier/TokenTest.php
+++ b/tests/HTMLPurifier/TokenTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/Token.php';
-
 class HTMLPurifier_TokenTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/URIDefinitionTest.php b/tests/HTMLPurifier/URIDefinitionTest.php
index bea361c6..1b0b9218 100644
--- a/tests/HTMLPurifier/URIDefinitionTest.php
+++ b/tests/HTMLPurifier/URIDefinitionTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIHarness.php';
-require_once 'HTMLPurifier/URIDefinition.php';
-
 class HTMLPurifier_URIDefinitionTest extends HTMLPurifier_URIHarness
 {
     
diff --git a/tests/HTMLPurifier/URIFilter/DisableExternalResourcesTest.php b/tests/HTMLPurifier/URIFilter/DisableExternalResourcesTest.php
index 545e421b..05b31b7e 100644
--- a/tests/HTMLPurifier/URIFilter/DisableExternalResourcesTest.php
+++ b/tests/HTMLPurifier/URIFilter/DisableExternalResourcesTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIFilter/DisableExternalTest.php';
-require_once 'HTMLPurifier/URIFilter/DisableExternalResources.php';
-
 class HTMLPurifier_URIFilter_DisableExternalResourcesTest extends
       HTMLPurifier_URIFilter_DisableExternalTest
 {
diff --git a/tests/HTMLPurifier/URIFilter/DisableExternalTest.php b/tests/HTMLPurifier/URIFilter/DisableExternalTest.php
index e4a0e89f..e4559f48 100644
--- a/tests/HTMLPurifier/URIFilter/DisableExternalTest.php
+++ b/tests/HTMLPurifier/URIFilter/DisableExternalTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIFilter/DisableExternal.php';
-require_once 'HTMLPurifier/URIFilterHarness.php';
-
 class HTMLPurifier_URIFilter_DisableExternalTest extends HTMLPurifier_URIFilterHarness
 {
     
diff --git a/tests/HTMLPurifier/URIFilter/HostBlacklistTest.php b/tests/HTMLPurifier/URIFilter/HostBlacklistTest.php
index d9a3fdd2..be35ad1b 100644
--- a/tests/HTMLPurifier/URIFilter/HostBlacklistTest.php
+++ b/tests/HTMLPurifier/URIFilter/HostBlacklistTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIFilter/HostBlacklist.php';
-require_once 'HTMLPurifier/URIFilterHarness.php';
-
 class HTMLPurifier_URIFilter_HostBlacklistTest extends HTMLPurifier_URIFilterHarness
 {
     
diff --git a/tests/HTMLPurifier/URIFilter/MakeAbsoluteTest.php b/tests/HTMLPurifier/URIFilter/MakeAbsoluteTest.php
index 51f47358..1b88392b 100644
--- a/tests/HTMLPurifier/URIFilter/MakeAbsoluteTest.php
+++ b/tests/HTMLPurifier/URIFilter/MakeAbsoluteTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIFilter/MakeAbsolute.php';
-require_once 'HTMLPurifier/URIFilterHarness.php';
-
 class HTMLPurifier_URIFilter_MakeAbsoluteTest extends HTMLPurifier_URIFilterHarness
 {
     
diff --git a/tests/HTMLPurifier/URIFilterHarness.php b/tests/HTMLPurifier/URIFilterHarness.php
index 04e101f2..1d8fea55 100644
--- a/tests/HTMLPurifier/URIFilterHarness.php
+++ b/tests/HTMLPurifier/URIFilterHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIHarness.php';
-
 class HTMLPurifier_URIFilterHarness extends HTMLPurifier_URIHarness
 {
     
diff --git a/tests/HTMLPurifier/URIHarness.php b/tests/HTMLPurifier/URIHarness.php
index 63e6d7d6..ebdd7f28 100644
--- a/tests/HTMLPurifier/URIHarness.php
+++ b/tests/HTMLPurifier/URIHarness.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIParser.php';
-
 class HTMLPurifier_URIHarness extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/URIParserTest.php b/tests/HTMLPurifier/URIParserTest.php
index 370e90ca..38a47d6d 100644
--- a/tests/HTMLPurifier/URIParserTest.php
+++ b/tests/HTMLPurifier/URIParserTest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIParser.php';
-require_once 'HTMLPurifier/URI.php';
-
 class HTMLPurifier_URIParserTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/URISchemeRegistryTest.php b/tests/HTMLPurifier/URISchemeRegistryTest.php
index 497d0f66..02fa04be 100644
--- a/tests/HTMLPurifier/URISchemeRegistryTest.php
+++ b/tests/HTMLPurifier/URISchemeRegistryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URISchemeRegistry.php';
-
 class HTMLPurifier_URISchemeRegistryTest extends HTMLPurifier_Harness
 {
     
diff --git a/tests/HTMLPurifier/URISchemeTest.php b/tests/HTMLPurifier/URISchemeTest.php
index 5b1f99a3..7f0f5666 100644
--- a/tests/HTMLPurifier/URISchemeTest.php
+++ b/tests/HTMLPurifier/URISchemeTest.php
@@ -1,18 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URI.php';
-require_once 'HTMLPurifier/URIHarness.php';
-
-require_once 'HTMLPurifier/URIScheme.php';
-require_once 'HTMLPurifier/URISchemeRegistry.php';
-
-require_once 'HTMLPurifier/URIScheme/http.php';
-require_once 'HTMLPurifier/URIScheme/ftp.php';
-require_once 'HTMLPurifier/URIScheme/https.php';
-require_once 'HTMLPurifier/URIScheme/mailto.php';
-require_once 'HTMLPurifier/URIScheme/news.php';
-require_once 'HTMLPurifier/URIScheme/nntp.php';
-
 // WARNING: All the URI schemes are far to relaxed, we need to tighten
 // the checks.
 
diff --git a/tests/HTMLPurifier/URITest.php b/tests/HTMLPurifier/URITest.php
index c15fbed7..4ad619d2 100644
--- a/tests/HTMLPurifier/URITest.php
+++ b/tests/HTMLPurifier/URITest.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URI.php';
-require_once 'HTMLPurifier/URIParser.php';
-
 class HTMLPurifier_URITest extends HTMLPurifier_URIHarness
 {
     
diff --git a/tests/HTMLPurifierTest.php b/tests/HTMLPurifierTest.php
index 2fe565cd..0d5eabae 100644
--- a/tests/HTMLPurifierTest.php
+++ b/tests/HTMLPurifierTest.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier.php';
-
-// integration test
-
 class HTMLPurifierTest extends HTMLPurifier_Harness
 {
     protected $purifier;
diff --git a/tests/index.php b/tests/index.php
index 83568c20..c23a64d3 100755
--- a/tests/index.php
+++ b/tests/index.php
@@ -11,6 +11,10 @@
  *   - file (f), a single file to test
  *   - xml, whether or not to output XML
  *   - dry, whether or not to do a dry run
+ *
+ * @warning File setup does not exactly match with autoloader; make sure that
+ *          non-test classes (i.e. classes that are not retrieved using
+ *          $test_files) do not have underscores in their names.
  */
 
 define('HTMLPurifierTest', 1);
@@ -56,8 +60,6 @@ if ($AC['disable-phpt'] && $AC['only-phpt']) {
 // initialize and load HTML Purifier
 // use ?standalone to load the alterative standalone stub
 if ($AC['standalone']) {
-    // :TODO: This line is pretty important; please document!
-    set_include_path(realpath('../library/standalone') . PATH_SEPARATOR . realpath('blanks') . PATH_SEPARATOR . get_include_path());
     require '../library/HTMLPurifier.standalone.php';
 } else {
     require '../library/HTMLPurifier.path.php';