diff --git a/NEWS b/NEWS
index cac5c31c..11b3438e 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 ! Added %Core.EscapeNonASCIICharacters to workaround loss of Unicode
   characters while %Core.Encoding is set to a non-UTF-8 encoding.
 . Implemented AttrDef_CSSURI for url(http://google.com) style declarations
+. Added convenient single test selector form on test runner
 
 1.3.3, unknown release date, likely to be dropped
 ! Moved SLOW to docs/enduser-slow.html and added code examples
diff --git a/TODO b/TODO
index 6a3bc84b..e8b6f1fc 100644
--- a/TODO
+++ b/TODO
@@ -36,6 +36,8 @@ TODO List
     - Friendly strict handling of <address> (block -> <br>)
 
 2.0 release
+ # Legit token based CSS parsing (will require revamping almost every
+   AttrDef class)
  # Formatters for plaintext (COMPLEX)
     - Auto-paragraphing (be sure to leverage fact that we know when things
       shouldn't be paragraphed, such as lists and tables).
diff --git a/tests/HTMLPurifier/AttrDef/BorderTest.php b/tests/HTMLPurifier/AttrDef/BorderTest.php
index 7a8153d5..b18bfe70 100644
--- a/tests/HTMLPurifier/AttrDef/BorderTest.php
+++ b/tests/HTMLPurifier/AttrDef/BorderTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/Border.php';
+require_once 'HTMLPurifier/AttrDef/PixelsTest.php';
 
 class HTMLPurifier_AttrDef_BorderTest extends HTMLPurifier_AttrDef_PixelsTest
 {
diff --git a/tests/HTMLPurifier/AttrDef/CSSLengthTest.php b/tests/HTMLPurifier/AttrDef/CSSLengthTest.php
index 99722eb3..f591f5d5 100644
--- a/tests/HTMLPurifier/AttrDef/CSSLengthTest.php
+++ b/tests/HTMLPurifier/AttrDef/CSSLengthTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/CSSLength.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
 
 class HTMLPurifier_AttrDef_CSSLengthTest extends HTMLPurifier_AttrDefHarness
 {
diff --git a/tests/HTMLPurifier/AttrDef/ColorTest.php b/tests/HTMLPurifier/AttrDef/ColorTest.php
index a38c551b..b44082c0 100644
--- a/tests/HTMLPurifier/AttrDef/ColorTest.php
+++ b/tests/HTMLPurifier/AttrDef/ColorTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/Color.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
 
 class HTMLPurifier_AttrDef_ColorTest extends HTMLPurifier_AttrDefHarness
 {
diff --git a/tests/HTMLPurifier/AttrDef/CompositeTest.php b/tests/HTMLPurifier/AttrDef/CompositeTest.php
index a61db20c..8ea7b5e8 100644
--- a/tests/HTMLPurifier/AttrDef/CompositeTest.php
+++ b/tests/HTMLPurifier/AttrDef/CompositeTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/Composite.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
 
 class HTMLPurifier_AttrDef_Composite_Testable extends
       HTMLPurifier_AttrDef_Composite
diff --git a/tests/HTMLPurifier/AttrDef/EmailHarness.php b/tests/HTMLPurifier/AttrDef/EmailHarness.php
index 715a5293..28bd06f1 100644
--- a/tests/HTMLPurifier/AttrDef/EmailHarness.php
+++ b/tests/HTMLPurifier/AttrDef/EmailHarness.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/Email.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
 
 class HTMLPurifier_AttrDef_EmailHarness extends HTMLPurifier_AttrDefHarness
 {
diff --git a/tests/HTMLPurifier/AttrDef/IntegerTest.php b/tests/HTMLPurifier/AttrDef/IntegerTest.php
index 20d71689..98cefbac 100644
--- a/tests/HTMLPurifier/AttrDef/IntegerTest.php
+++ b/tests/HTMLPurifier/AttrDef/IntegerTest.php
@@ -1,6 +1,7 @@
 <?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/MultipleTest.php b/tests/HTMLPurifier/AttrDef/MultipleTest.php
index e5e6b986..8c102b39 100644
--- a/tests/HTMLPurifier/AttrDef/MultipleTest.php
+++ b/tests/HTMLPurifier/AttrDef/MultipleTest.php
@@ -1,7 +1,10 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef/Integer.php';
 require_once 'HTMLPurifier/AttrDef/Multiple.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
+
+// borrowed for the sakes of this test
+require_once 'HTMLPurifier/AttrDef/Integer.php';
 
 class HTMLPurifier_AttrDef_MultipleTest extends HTMLPurifier_AttrDefHarness
 {
diff --git a/tests/HTMLPurifier/AttrDef/NumberTest.php b/tests/HTMLPurifier/AttrDef/NumberTest.php
index 3ddb6b5c..4ddea5e6 100644
--- a/tests/HTMLPurifier/AttrDef/NumberTest.php
+++ b/tests/HTMLPurifier/AttrDef/NumberTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/Number.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
 
 class HTMLPurifier_AttrDef_NumberTest extends HTMLPurifier_AttrDefHarness
 {
diff --git a/tests/HTMLPurifier/AttrDef/PercentageTest.php b/tests/HTMLPurifier/AttrDef/PercentageTest.php
index 166cd24f..6694296c 100644
--- a/tests/HTMLPurifier/AttrDef/PercentageTest.php
+++ b/tests/HTMLPurifier/AttrDef/PercentageTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrDef/Percentage.php';
+require_once 'HTMLPurifier/AttrDefHarness.php';
 
 class HTMLPurifier_AttrDef_PercentageTest extends HTMLPurifier_AttrDefHarness
 {
diff --git a/tests/HTMLPurifier/AttrTransform/BdoDirTest.php b/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
index 4f880046..93b051dc 100644
--- a/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
+++ b/tests/HTMLPurifier/AttrTransform/BdoDirTest.php
@@ -1,6 +1,7 @@
 <?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/ImgRequiredTest.php b/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
index f8b89f44..bd008625 100644
--- a/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
+++ b/tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php
@@ -1,6 +1,7 @@
 <?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/TextAlignTest.php b/tests/HTMLPurifier/AttrTransform/TextAlignTest.php
index 858db75c..55d6cb05 100644
--- a/tests/HTMLPurifier/AttrTransform/TextAlignTest.php
+++ b/tests/HTMLPurifier/AttrTransform/TextAlignTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/AttrTransform/TextAlign.php';
+require_once 'HTMLPurifier/AttrTransformHarness.php';
 
 class HTMLPurifier_AttrTransform_TextAlignTest extends HTMLPurifier_AttrTransformHarness
 {
diff --git a/tests/index.php b/tests/index.php
index 4511ac82..55c09136 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -8,6 +8,8 @@ error_reporting(E_ALL);
 // wishlist: automated calling of this file from multiple PHP versions so we
 // don't have to constantly switch around
 
+$GLOBALS['HTMLPurifierTest'] = array();
+
 // configuration
 $GLOBALS['HTMLPurifierTest']['PEAR'] = false; // do PEAR tests
 
@@ -106,6 +108,9 @@ if (version_compare(PHP_VERSION, '5', '>=')) {
     $test_files[] = 'TokenFactoryTest.php';
 }
 
+sort($test_files);
+$GLOBALS['HTMLPurifierTest']['Files'] = $test_files;
+
 $test_file_lookup = array_flip($test_files);
 
 function htmlpurifier_path2class($path) {
@@ -119,12 +124,48 @@ function htmlpurifier_path2class($path) {
     return $temp;
 }
 
-// we can't use addTestFile because SimpleTest chokes on E_STRICT warnings
+// use a customized reporter with some helpful UI widgets
 
 if (isset($_GET['f']) && isset($test_file_lookup[$_GET['f']])) {
+    $GLOBALS['HTMLPurifierTest']['File'] = $_GET['f'];
+} else {
+    $GLOBALS['HTMLPurifierTest']['File'] = false;
+}
+
+class HTMLPurifier_SimpleTest_Reporter extends HTMLReporter
+{
     
-    // execute only one test
-    $test_file = $_GET['f'];
+    function paintHeader($test_name) {
+        parent::paintHeader($test_name);
+        $test_file = $GLOBALS['HTMLPurifierTest']['File'];
+?>
+<form action="" method="get" id="select">
+    <select name="f">
+        <option value="" style="font-weight:bold;"<?php if(!$test_file) {echo ' selected';} ?>>All Tests</option>
+        <?php foreach($GLOBALS['HTMLPurifierTest']['Files'] as $file) { ?>
+            <option value="<?php echo $file ?>"<?php
+                if ($test_file == $file) echo ' selected';
+            ?>><?php echo $file ?></option>
+        <?php } ?>
+    </select>
+    <input type="submit" value="Go">
+</form>
+<?php
+        flush();
+    }
+    
+    function _getCss() {
+        $css = parent::_getCss();
+        $css .= '
+        #select {position:absolute;top:0.2em;right:0.2em;}
+        ';
+        return $css;
+    }
+    
+}
+
+// we can't use addTestFile because SimpleTest chokes on E_STRICT warnings
+if ($test_file = $GLOBALS['HTMLPurifierTest']['File']) {
     
     $test = new GroupTest($test_file . ' - HTML Purifier');
     $path = 'HTMLPurifier/' . $test_file;
@@ -144,7 +185,7 @@ if (isset($_GET['f']) && isset($test_file_lookup[$_GET['f']])) {
 }
 
 if (SimpleReporter::inCli()) $reporter = new TextReporter();
-else $reporter = new HTMLReporter('UTF-8');
+else $reporter = new HTMLPurifier_SimpleTest_Reporter('UTF-8');
 
 $test->run($reporter);