diff --git a/HTML_Purifier.php b/HTMLPurifier.php
similarity index 100%
rename from HTML_Purifier.php
rename to HTMLPurifier.php
diff --git a/tester.php b/tester.php
deleted file mode 100644
index 4f88adcf..00000000
--- a/tester.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-load_simpletest(); // includes all relevant simpletest files
-
-require_once 'XML/HTMLSax3.php'; // optional PEAR class
-
-require_once 'HTMLPurifier.php';
-require_once 'Lexer.php';
-require_once 'Token.php';
-require_once 'PureHTMLDefinition.php';
-require_once 'Generator.php';
-
-$test = new GroupTest('HTML_Purifier');
-
-chdir('tests/');
-$test->addTestFile('HTMLPurifier.php');
-$test->addTestFile('Lexer.php');
-//$test->addTestFile('Token.php');
-$test->addTestFile('PureHTMLDefinition.php');
-$test->addTestFile('Generator.php');
-chdir('../');
-
-$test->run( new HtmlReporter() );
-
-?>
\ No newline at end of file
diff --git a/tests/HTML_Purifier.php b/tests/HTMLPurifier.php
similarity index 100%
rename from tests/HTML_Purifier.php
rename to tests/HTMLPurifier.php
diff --git a/tests/index.php b/tests/index.php
new file mode 100644
index 00000000..247b1d0a
--- /dev/null
+++ b/tests/index.php
@@ -0,0 +1,27 @@
+<?php
+
+load_simpletest(); // includes all relevant simpletest files
+
+// emulates inserting a dir called HTMLPurifier into your class dir
+set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
+
+require_once 'XML/HTMLSax3.php'; // optional PEAR class
+
+// enforce proper namespacing
+require_once 'HTMLPurifier/HTMLPurifier.php';
+require_once 'HTMLPurifier/Lexer.php';
+require_once 'HTMLPurifier/Token.php';
+require_once 'HTMLPurifier/PureHTMLDefinition.php';
+require_once 'HTMLPurifier/Generator.php';
+
+$test = new GroupTest('HTMLPurifier');
+
+$test->addTestFile('HTMLPurifier.php');
+$test->addTestFile('Lexer.php');
+//$test->addTestFile('Token.php');
+$test->addTestFile('PureHTMLDefinition.php');
+$test->addTestFile('Generator.php');
+
+$test->run( new HtmlReporter() );
+
+?>
\ No newline at end of file