diff --git a/testing/bootstrap.php b/testing/bootstrap.php
index a38182b..a4ab6bb 100644
--- a/testing/bootstrap.php
+++ b/testing/bootstrap.php
@@ -16,8 +16,6 @@

 namespace phalanx\test;

-require_once 'PHPUnit/Framework.php';
-
 if (!defined('PHALANX_ROOT'))
 {
     define('PHALANX_ROOT', dirname(dirname(__FILE__)));
diff --git a/testing/phpunit.xml b/testing/phpunit.xml
index ebc3356..223dbb6 100644
--- a/testing/phpunit.xml
+++ b/testing/phpunit.xml
@@ -15,6 +15,7 @@
   this program.  If not, see <http://www.gnu.org/licenses/>.
 -->

+<!-- Tested with PHPUnit 3.5.5 -->
 <phpunit bootstrap="./bootstrap.php"
          backupGlobals="FALSE"
          backupStaticAttributes="FALSE"
diff --git a/testing/tests/base.php b/testing/tests/base.php
index fe863a2..fa2eea5 100644
--- a/testing/tests/base.php
+++ b/testing/tests/base.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\base as base;

-require_once 'PHPUnit/Framework.php';
-
 // Common includes.
 require_once PHALANX_ROOT . '/base/functions.php';
 require_once PHALANX_ROOT . '/base/key_descender.php';
diff --git a/testing/tests/base/functions_test.php b/testing/tests/base/functions_test.php
index 6b4ba3a..c4c5ff0 100644
--- a/testing/tests/base/functions_test.php
+++ b/testing/tests/base/functions_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\base as base;

-require_once 'PHPUnit/Framework.php';
-
 class FunctionsTest extends \PHPUnit_Framework_TestCase
 {
     public function testArrayStripEmpty()
diff --git a/testing/tests/base/key_descender_test.php b/testing/tests/base/key_descender_test.php
index 14dd70f..5e66cfd 100644
--- a/testing/tests/base/key_descender_test.php
+++ b/testing/tests/base/key_descender_test.php
@@ -18,8 +18,6 @@ namespace phalanx\test;
 use \phalanx\base as base;
 use \phalanx\base\KeyDescender as KeyDescender;

-require_once 'PHPUnit/Framework.php';
-
 class KeyDescenderTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructWithRef()
diff --git a/testing/tests/base/property_bag_test.php b/testing/tests/base/property_bag_test.php
index 3b1b1b0..2c0ddb5 100644
--- a/testing/tests/base/property_bag_test.php
+++ b/testing/tests/base/property_bag_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\base as base;

-require_once 'PHPUnit/Framework.php';
-
 class PropertyBagTest extends \PHPUnit_Framework_TestCase
 {
     public $bag;
diff --git a/testing/tests/data.php b/testing/tests/data.php
index c72ec0f..5b87acd 100644
--- a/testing/tests/data.php
+++ b/testing/tests/data.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data as data;

-require_once 'PHPUnit/Framework.php';
-
 // Common includes.
 require_once PHALANX_ROOT . '/data/cleaner.php';
 require_once PHALANX_ROOT . '/data/form_key.php';
diff --git a/testing/tests/data/cleaner_test.php b/testing/tests/data/cleaner_test.php
index a4bcb78..1dffd95 100644
--- a/testing/tests/data/cleaner_test.php
+++ b/testing/tests/data/cleaner_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data\Cleaner as Cleaner;

-require_once 'PHPUnit/Framework.php';
-
 class CleanerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
diff --git a/testing/tests/data/form_key_event_test.php b/testing/tests/data/form_key_event_test.php
index 5eb27e3..44e0055 100644
--- a/testing/tests/data/form_key_event_test.php
+++ b/testing/tests/data/form_key_event_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data as data;

-require_once 'PHPUnit/Framework.php';
-
 require_once PHALANX_ROOT . '/tasks/task.php';
 require_once TEST_ROOT . '/tests/data.php';

diff --git a/testing/tests/data/form_key_test.php b/testing/tests/data/form_key_test.php
index 112cc5a..97ed0ed 100644
--- a/testing/tests/data/form_key_test.php
+++ b/testing/tests/data/form_key_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data as data;

-require_once 'PHPUnit/Framework.php';
-
 require_once TEST_ROOT . '/tests/data.php';

 class FormKeyTest extends \PHPUnit_Framework_TestCase
diff --git a/testing/tests/data/keyed_cleaner_test.php b/testing/tests/data/keyed_cleaner_test.php
index adf9f1a..5ad889e 100644
--- a/testing/tests/data/keyed_cleaner_test.php
+++ b/testing/tests/data/keyed_cleaner_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data as data;

-require_once 'PHPUnit/Framework.php';
-
 class KeyedCleanerTest extends \PHPUnit_Framework_TestCase
 {
     public $fixture;
diff --git a/testing/tests/data/model_test.php b/testing/tests/data/model_test.php
index 6011d47..c84cf69 100644
--- a/testing/tests/data/model_test.php
+++ b/testing/tests/data/model_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data as data;

-require_once 'PHPUnit/Framework.php';
-
 class CompoundKeyModel extends data\Model
 {
     protected $table = 'test_compound';
diff --git a/testing/tests/data/validating_model_test.php b/testing/tests/data/validating_model_test.php
index 44b3a72..62b4884 100644
--- a/testing/tests/data/validating_model_test.php
+++ b/testing/tests/data/validating_model_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\data as data;

-require_once 'PHPUnit/Framework.php';
-
 class ValidatingTestModelValidator extends data\ModelValidator
 {
     public $validate_title_return_value = TRUE;
diff --git a/testing/tests/tasks.php b/testing/tests/tasks.php
index 31880ea..87de739 100644
--- a/testing/tests/tasks.php
+++ b/testing/tests/tasks.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 // Common includes.
 require_once PHALANX_ROOT . '/tasks/cli_dispatcher.php';
 require_once PHALANX_ROOT . '/tasks/cli_output_handler.php';
diff --git a/testing/tests/tasks/cli_dispatcher_test.php b/testing/tests/tasks/cli_dispatcher_test.php
index d12803f..ed070e2 100644
--- a/testing/tests/tasks/cli_dispatcher_test.php
+++ b/testing/tests/tasks/cli_dispatcher_test.php
@@ -17,7 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
 require_once TEST_ROOT . '/tests/tasks.php';

 class TestCLIDispatcher extends tasks\CLIDispatcher
diff --git a/testing/tests/tasks/cli_output_handler_test.php b/testing/tests/tasks/cli_output_handler_test.php
index aa3c22d..9792e4c 100644
--- a/testing/tests/tasks/cli_output_handler_test.php
+++ b/testing/tests/tasks/cli_output_handler_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 class MessageTask extends tasks\Task
 {
     public $message = null;
diff --git a/testing/tests/tasks/dispatcher_test.php b/testing/tests/tasks/dispatcher_test.php
index a3a7643..7082eaf 100644
--- a/testing/tests/tasks/dispatcher_test.php
+++ b/testing/tests/tasks/dispatcher_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 class DispatcherTest extends \PHPUnit_Framework_TestCase
 {
     protected $dispatcher;
diff --git a/testing/tests/tasks/http_dispatcher_test.php b/testing/tests/tasks/http_dispatcher_test.php
index d754729..adbebe0 100644
--- a/testing/tests/tasks/http_dispatcher_test.php
+++ b/testing/tests/tasks/http_dispatcher_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 class TestHTTPDispatcher extends tasks\HTTPDispatcher
 {
     public function T_set_request_method($m) { $this->request_method = $m; }
diff --git a/testing/tests/tasks/output_handler_test.php b/testing/tests/tasks/output_handler_test.php
index 1cc6657..fa9afe7 100644
--- a/testing/tests/tasks/output_handler_test.php
+++ b/testing/tests/tasks/output_handler_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 class OutputHandlerTest extends \PHPUnit_Framework_TestCase
 {
     protected $handler;
diff --git a/testing/tests/tasks/task_pump_test.php b/testing/tests/tasks/task_pump_test.php
index 3555259..7128a4b 100644
--- a/testing/tests/tasks/task_pump_test.php
+++ b/testing/tests/tasks/task_pump_test.php
@@ -18,8 +18,6 @@ namespace phalanx\test;
 use \phalanx\tasks as tasks;
 use \phalanx\tasks\TaskPump;

-require_once 'PHPUnit/Framework.php';
-
 require_once TEST_ROOT . '/tests/tasks.php';

 $test = NULL;
diff --git a/testing/tests/tasks/task_test.php b/testing/tests/tasks/task_test.php
index 5e0a9eb..41f2cf5 100644
--- a/testing/tests/tasks/task_test.php
+++ b/testing/tests/tasks/task_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 class TaskTest extends \PHPUnit_Framework_TestCase
 {
     protected $task;
diff --git a/testing/tests/tasks/unit_test_output_handler_test.php b/testing/tests/tasks/unit_test_output_handler_test.php
index 0dd31fb..1289c85 100644
--- a/testing/tests/tasks/unit_test_output_handler_test.php
+++ b/testing/tests/tasks/unit_test_output_handler_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
-
 class UnitTestOutputHandlerTest extends \PHPUnit_Framework_TestCase
 {
     public $handler;
diff --git a/testing/tests/tasks/view_output_handler_test.php b/testing/tests/tasks/view_output_handler_test.php
index e5ff9d5..015833b 100644
--- a/testing/tests/tasks/view_output_handler_test.php
+++ b/testing/tests/tasks/view_output_handler_test.php
@@ -17,7 +17,6 @@
 namespace phalanx\test;
 use \phalanx\tasks as tasks;

-require_once 'PHPUnit/Framework.php';
 require_once TEST_ROOT . '/tests/views.php';

 class CustomViewTask extends TestTask implements \phalanx\views\CustomViewTask
diff --git a/testing/tests/views.php b/testing/tests/views.php
index a0525e5..7507547 100644
--- a/testing/tests/views.php
+++ b/testing/tests/views.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use \phalanx\views as views;

-require_once 'PHPUnit/Framework.php';
-
 // Common includes.
 require_once PHALANX_ROOT . '/views/custom_view_task.php';
 require_once PHALANX_ROOT . '/views/view.php';
diff --git a/testing/tests/views/view_test.php b/testing/tests/views/view_test.php
index 2e63153..f316690 100644
--- a/testing/tests/views/view_test.php
+++ b/testing/tests/views/view_test.php
@@ -17,8 +17,6 @@
 namespace phalanx\test;
 use phalanx\views\View;

-require_once 'PHPUnit/Framework.php';
-
 require_once TEST_ROOT . '/tests/views.php';

 class ViewTest extends \PHPUnit_Framework_TestCase