diff --git a/NEWS b/NEWS
index f14dbf92..1f45b4a7 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,8 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 . htmlpurifier_add_test() preferred method to translate test files in to
   classes, because it handles PHPT files too.
 . Debugger class is deprecated and will be removed soon.
+. Command line argument parsing for testing scripts revamped, now --opt value
+  format is supported.
 
 3.0.0, released 2008-01-06
 # HTML Purifier is PHP 5 only! The 2.1.x branch will be maintained
diff --git a/tests/HTMLPurifier/PHPT/loading/auto-includes.phpt b/tests/HTMLPurifier/PHPT/loading/auto-includes.phpt
index 707acc32..75a658b7 100644
--- a/tests/HTMLPurifier/PHPT/loading/auto-includes.phpt
+++ b/tests/HTMLPurifier/PHPT/loading/auto-includes.phpt
@@ -1,11 +1,11 @@
---TEST--
-HTMLPurifier.auto.php and HTMLPurifier.includes.php loading test
---FILE--
-<?php
-require_once '../library/HTMLPurifier.auto.php';
-require_once 'HTMLPurifier.includes.php';
-$config = HTMLPurifier_Config::createDefault();
-$purifier = new HTMLPurifier($config);
-echo $purifier->purify('<b>Salsa!');
---EXPECT--
-<b>Salsa!</b>
+--TEST--
+HTMLPurifier.auto.php and HTMLPurifier.includes.php loading test
+--FILE--
+<?php
+require_once '../library/HTMLPurifier.auto.php';
+require_once 'HTMLPurifier.includes.php';
+$config = HTMLPurifier_Config::createDefault();
+$purifier = new HTMLPurifier($config);
+echo $purifier->purify('<b>Salsa!');
+--EXPECT--
+<b>Salsa!</b>
diff --git a/tests/HTMLPurifier/PHPT/loading/auto-with-autoload.phpt b/tests/HTMLPurifier/PHPT/loading/auto-with-autoload.phpt
index e62168bd..bb2dfa72 100644
--- a/tests/HTMLPurifier/PHPT/loading/auto-with-autoload.phpt
+++ b/tests/HTMLPurifier/PHPT/loading/auto-with-autoload.phpt
@@ -1,25 +1,25 @@
---TEST--
-HTMLPurifier.auto.php using spl_autoload_register with __autoload() already defined loading test
---SKIPIF--
-<?php
-if (!function_exists('spl_autoload_register')) {
-    echo "skip - spl_autoload_register() not available";
-}
---FILE--
-<?php
-function __autoload($class) {
-    echo "Autoloading $class..." . PHP_EOL;
-    eval("class $class {}");
-}
-
-require_once '../library/HTMLPurifier.auto.php';
-$config = HTMLPurifier_Config::createDefault();
-$purifier = new HTMLPurifier($config);
-echo $purifier->purify('<b>Salsa!') . PHP_EOL;
-
-// purposely invoke older autoload
-$bar = new Bar();
-
---EXPECT--
-<b>Salsa!</b>
-Autoloading Bar...
+--TEST--
+HTMLPurifier.auto.php using spl_autoload_register with __autoload() already defined loading test
+--SKIPIF--
+<?php
+if (!function_exists('spl_autoload_register')) {
+    echo "skip - spl_autoload_register() not available";
+}
+--FILE--
+<?php
+function __autoload($class) {
+    echo "Autoloading $class..." . PHP_EOL;
+    eval("class $class {}");
+}
+
+require_once '../library/HTMLPurifier.auto.php';
+$config = HTMLPurifier_Config::createDefault();
+$purifier = new HTMLPurifier($config);
+echo $purifier->purify('<b>Salsa!') . PHP_EOL;
+
+// purposely invoke older autoload
+$bar = new Bar();
+
+--EXPECT--
+<b>Salsa!</b>
+Autoloading Bar...
diff --git a/tests/HTMLPurifier/PHPT/loading/auto-with-spl-autoload.phpt b/tests/HTMLPurifier/PHPT/loading/auto-with-spl-autoload.phpt
index 8ab727ea..23c7f46f 100644
--- a/tests/HTMLPurifier/PHPT/loading/auto-with-spl-autoload.phpt
+++ b/tests/HTMLPurifier/PHPT/loading/auto-with-spl-autoload.phpt
@@ -1,25 +1,25 @@
---TEST--
-HTMLPurifier.auto.php using spl_autoload_register with userland spl_autoload registration loading test
---SKIPIF--
-<?php
-if (!function_exists('spl_autoload_register')) {
-    echo "skip - spl_autoload_register() not available";
-}
---FILE--
-<?php
-function __autoload($class) {
-    echo "Autoloading $class..." . PHP_EOL;
-    eval("class $class {}");
-}
-
-require_once '../library/HTMLPurifier.auto.php';
-$config = HTMLPurifier_Config::createDefault();
-$purifier = new HTMLPurifier($config);
-echo $purifier->purify('<b>Salsa!') . PHP_EOL;
-
-// purposely invoke older autoload
-$bar = new Bar();
-
---EXPECT--
-<b>Salsa!</b>
-Autoloading Bar...
+--TEST--
+HTMLPurifier.auto.php using spl_autoload_register with userland spl_autoload registration loading test
+--SKIPIF--
+<?php
+if (!function_exists('spl_autoload_register')) {
+    echo "skip - spl_autoload_register() not available";
+}
+--FILE--
+<?php
+function __autoload($class) {
+    echo "Autoloading $class..." . PHP_EOL;
+    eval("class $class {}");
+}
+
+require_once '../library/HTMLPurifier.auto.php';
+$config = HTMLPurifier_Config::createDefault();
+$purifier = new HTMLPurifier($config);
+echo $purifier->purify('<b>Salsa!') . PHP_EOL;
+
+// purposely invoke older autoload
+$bar = new Bar();
+
+--EXPECT--
+<b>Salsa!</b>
+Autoloading Bar...
diff --git a/tests/HTMLPurifier/PHPT/loading/auto.phpt b/tests/HTMLPurifier/PHPT/loading/auto.phpt
index e342f6ad..c83319ee 100644
--- a/tests/HTMLPurifier/PHPT/loading/auto.phpt
+++ b/tests/HTMLPurifier/PHPT/loading/auto.phpt
@@ -1,10 +1,10 @@
---TEST--
-HTMLPurifier.auto.php loading test
---FILE--
-<?php
-require_once '../library/HTMLPurifier.auto.php';
-$config = HTMLPurifier_Config::createDefault();
-$purifier = new HTMLPurifier($config);
-echo $purifier->purify('<b>Salsa!');
---EXPECT--
-<b>Salsa!</b>
+--TEST--
+HTMLPurifier.auto.php loading test
+--FILE--
+<?php
+require_once '../library/HTMLPurifier.auto.php';
+$config = HTMLPurifier_Config::createDefault();
+$purifier = new HTMLPurifier($config);
+echo $purifier->purify('<b>Salsa!');
+--EXPECT--
+<b>Salsa!</b>
diff --git a/tests/HTMLPurifier/PHPT/stub.phpt b/tests/HTMLPurifier/PHPT/stub.phpt
index 02651c52..fa8199cf 100644
--- a/tests/HTMLPurifier/PHPT/stub.phpt
+++ b/tests/HTMLPurifier/PHPT/stub.phpt
@@ -1,6 +1,6 @@
---TEST--
-PHPT testing framework smoketest
---FILE--
-Foobar
---EXPECT--
-Foobar
+--TEST--
+PHPT testing framework smoketest
+--FILE--
+Foobar
+--EXPECT--
+Foobar