--- tests/Zend/Service/Amazon/SimpleDb/AllTests.php	(revision 23450)
+++ tests/Zend/Service/Amazon/SimpleDb/AllTests.php	(working copy)
@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AllTests.php 11973 2008-10-15 16:00:56Z matthew $
+ * @version    $Id$
  */
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
Index: tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php	(working copy)
@@ -26,7 +26,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Availabilityzones.php';
Index: tests/Zend/Service/Amazon/Ec2/EbsTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/EbsTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/EbsTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Ebs.php';
Index: tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/CloudWatchTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Service/Amazon/Ec2/CloudWatch.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
Index: tests/Zend/Service/Amazon/Ec2/ElasticipTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/ElasticipTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/ElasticipTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Elasticip.php';
Index: tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/InstanceWindowsTest.php	(working copy)
@@ -28,7 +28,6 @@
 require_once 'Zend/Service/Amazon/Ec2/Instance/Windows.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Zend_Service_Amazon_Ec2_Instance_Windows test case.
Index: tests/Zend/Service/Amazon/Ec2/ImageTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/ImageTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/ImageTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Image.php';
Index: tests/Zend/Service/Amazon/Ec2/RegionTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/RegionTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/RegionTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Region.php';
Index: tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/InstanceReservedTest.php	(working copy)
@@ -28,7 +28,6 @@
 require_once 'Zend/Service/Amazon/Ec2/Instance/Reserved.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Zend_Service_Amazon_Ec2_Instance_Reserved test case.
Index: tests/Zend/Service/Amazon/Ec2/InstanceTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/InstanceTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/InstanceTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Instance.php';
Index: tests/Zend/Service/Amazon/Ec2/KeypairTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/KeypairTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/KeypairTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Keypair.php';
Index: tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php
===================================================================
--- tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/Ec2/SecuritygroupsTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
 require_once 'Zend/Service/Amazon/Ec2/Securitygroups.php';
Index: tests/Zend/Service/Amazon/AbstractTest.php
===================================================================
--- tests/Zend/Service/Amazon/AbstractTest.php	(revision 23450)
+++ tests/Zend/Service/Amazon/AbstractTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Service/Amazon/Abstract.php';
 
 /**
Index: tests/Zend/Crypt/MathTest.php
===================================================================
--- tests/Zend/Crypt/MathTest.php	(revision 23450)
+++ tests/Zend/Crypt/MathTest.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Math.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Crypt/Rsa/RsaTest.php
===================================================================
--- tests/Zend/Crypt/Rsa/RsaTest.php	(revision 23450)
+++ tests/Zend/Crypt/Rsa/RsaTest.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Rsa.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Crypt/Math/BigInteger/BcmathTest.php
===================================================================
--- tests/Zend/Crypt/Math/BigInteger/BcmathTest.php	(revision 23450)
+++ tests/Zend/Crypt/Math/BigInteger/BcmathTest.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Crypt/Math/BigInteger/GmpTest.php
===================================================================
--- tests/Zend/Crypt/Math/BigInteger/GmpTest.php	(revision 23450)
+++ tests/Zend/Crypt/Math/BigInteger/GmpTest.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Math/BigInteger/Gmp.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php';
 
Index: tests/Zend/Crypt/DiffieHellmanTest.php
===================================================================
--- tests/Zend/Crypt/DiffieHellmanTest.php	(revision 23450)
+++ tests/Zend/Crypt/DiffieHellmanTest.php	(working copy)
@@ -22,7 +22,6 @@
 
 require_once 'Zend/Crypt/DiffieHellman.php';
 require_once 'Zend/Crypt/Math/BigInteger.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Crypt/HmacTest.php
===================================================================
--- tests/Zend/Crypt/HmacTest.php	(revision 23450)
+++ tests/Zend/Crypt/HmacTest.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Hmac.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Outside the Internal Function tests, tests do not distinguish between hash and mhash
Index: tests/Zend/Soap/WsdlTest.php
===================================================================
--- tests/Zend/Soap/WsdlTest.php	(revision 23450)
+++ tests/Zend/Soap/WsdlTest.php	(working copy)
@@ -22,9 +22,6 @@
 
 require_once dirname(__FILE__)."/../../TestHelper.php";
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** Zend_Soap_Wsdl */
 require_once 'Zend/Soap/Wsdl.php';
 
Index: tests/Zend/Soap/ClientTest.php
===================================================================
--- tests/Zend/Soap/ClientTest.php	(revision 23450)
+++ tests/Zend/Soap/ClientTest.php	(working copy)
@@ -26,9 +26,6 @@
 
 require_once dirname(__FILE__)."/../../TestHelper.php";
 
-/** PHPUnit Test Case */
-require_once "PHPUnit/Framework/TestCase.php";
-
 /** Zend_Soap_Server */
 require_once 'Zend/Soap/Server.php';
 
Index: tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php
===================================================================
--- tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php	(revision 23450)
+++ tests/Zend/Soap/Wsdl/ArrayOfTypeSequenceStrategyTest.php	(working copy)
@@ -26,9 +26,6 @@
 
 require_once dirname(__FILE__)."/../../../TestHelper.php";
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** Zend_Soap_Wsdl */
 require_once 'Zend/Soap/Wsdl.php';
 
Index: tests/Zend/Soap/ServerTest.php
===================================================================
--- tests/Zend/Soap/ServerTest.php	(revision 23450)
+++ tests/Zend/Soap/ServerTest.php	(working copy)
@@ -22,9 +22,6 @@
 
 require_once dirname(__FILE__)."/../../TestHelper.php";
 
-/** PHPUnit Test Case */
-require_once "PHPUnit/Framework/TestCase.php";
-
 /** Zend_Soap_Server */
 require_once 'Zend/Soap/Server.php';
 
Index: tests/Zend/Soap/AutoDiscoverTest.php
===================================================================
--- tests/Zend/Soap/AutoDiscoverTest.php	(revision 23450)
+++ tests/Zend/Soap/AutoDiscoverTest.php	(working copy)
@@ -22,9 +22,6 @@
 
 require_once dirname(__FILE__)."/../../TestHelper.php";
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** Zend_Soap_AutoDiscover */
 require_once 'Zend/Soap/AutoDiscover.php';
 
Index: tests/Zend/Feed/Reader/Entry/AtomStandaloneEntryTest.php
===================================================================
--- tests/Zend/Feed/Reader/Entry/AtomStandaloneEntryTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Entry/AtomStandaloneEntryTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id: AtomTest.php 19159 2009-11-21 14:23:15Z padraic $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Entry/AtomTest.php
===================================================================
--- tests/Zend/Feed/Reader/Entry/AtomTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Entry/AtomTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Entry/RssTest.php
===================================================================
--- tests/Zend/Feed/Reader/Entry/RssTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Entry/RssTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Entry/CommonTest.php
===================================================================
--- tests/Zend/Feed/Reader/Entry/CommonTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Entry/CommonTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Feed/AtomTest.php
===================================================================
--- tests/Zend/Feed/Reader/Feed/AtomTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Feed/AtomTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Feed/AtomSourceTest.php
===================================================================
--- tests/Zend/Feed/Reader/Feed/AtomSourceTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Feed/AtomSourceTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id: AtomTest.php 19168 2009-11-21 17:17:18Z padraic $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Feed/RssTest.php
===================================================================
--- tests/Zend/Feed/Reader/Feed/RssTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Feed/RssTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 require_once 'Zend/Registry.php';
 
Index: tests/Zend/Feed/Reader/Feed/CommonTest.php
===================================================================
--- tests/Zend/Feed/Reader/Feed/CommonTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Feed/CommonTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 require_once 'Zend/Registry.php';
 
Index: tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php
===================================================================
--- tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php
===================================================================
--- tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php
===================================================================
--- tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php
===================================================================
--- tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php
===================================================================
--- tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php	(revision 23450)
+++ tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**
Index: tests/Zend/Feed/ReaderTest.php
===================================================================
--- tests/Zend/Feed/ReaderTest.php	(revision 23450)
+++ tests/Zend/Feed/ReaderTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 require_once 'Zend/Cache.php';
 
Index: tests/Zend/OpenIdTest.php
===================================================================
--- tests/Zend/OpenIdTest.php	(revision 23450)
+++ tests/Zend/OpenIdTest.php	(working copy)
@@ -32,12 +32,7 @@
 require_once 'Zend/OpenId.php';
 
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
 
-
 /**
  * Zend_OpenId_ResponseHelper
  */
Index: tests/Zend/Serializer/SerializerTest.php
===================================================================
--- tests/Zend/Serializer/SerializerTest.php	(revision 23450)
+++ tests/Zend/Serializer/SerializerTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/JsonTest.php
===================================================================
--- tests/Zend/Serializer/Adapter/JsonTest.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/JsonTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/Json.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/PhpSerializeTest.php
===================================================================
--- tests/Zend/Serializer/Adapter/PhpSerializeTest.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/PhpSerializeTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/PhpSerialize.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/PhpCodeTest.php
===================================================================
--- tests/Zend/Serializer/Adapter/PhpCodeTest.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/PhpCodeTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/PhpCode.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/Amf0Test.php
===================================================================
--- tests/Zend/Serializer/Adapter/Amf0Test.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/Amf0Test.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/Amf0.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php
===================================================================
--- tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/PythonPickle.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/IgbinaryTest.php
===================================================================
--- tests/Zend/Serializer/Adapter/IgbinaryTest.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/IgbinaryTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/Igbinary.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php
===================================================================
--- tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/PythonPickle.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php
===================================================================
--- tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/PythonPickle.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/Amf3Test.php
===================================================================
--- tests/Zend/Serializer/Adapter/Amf3Test.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/Amf3Test.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/Amf3.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Serializer/Adapter/WddxTest.php
===================================================================
--- tests/Zend/Serializer/Adapter/WddxTest.php	(revision 23450)
+++ tests/Zend/Serializer/Adapter/WddxTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Serializer/Adapter/Wddx.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Serializer
  * @subpackage UnitTests
Index: tests/Zend/Pdf/NamedDestinationsTest.php
===================================================================
--- tests/Zend/Pdf/NamedDestinationsTest.php	(revision 23450)
+++ tests/Zend/Pdf/NamedDestinationsTest.php	(working copy)
@@ -24,9 +24,6 @@
 require_once 'Zend/Pdf.php';
 
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/Pdf/DrawingTest.php
===================================================================
--- tests/Zend/Pdf/DrawingTest.php	(revision 23450)
+++ tests/Zend/Pdf/DrawingTest.php	(working copy)
@@ -45,9 +45,6 @@
 require_once 'Zend/Pdf/Font.php';
 
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/Pdf/ProcessingTest.php
===================================================================
--- tests/Zend/Pdf/ProcessingTest.php	(revision 23450)
+++ tests/Zend/Pdf/ProcessingTest.php	(working copy)
@@ -23,9 +23,6 @@
 /** Zend_Pdf */
 require_once 'Zend/Pdf.php';
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/Pdf/ActionTest.php
===================================================================
--- tests/Zend/Pdf/ActionTest.php	(revision 23450)
+++ tests/Zend/Pdf/ActionTest.php	(working copy)
@@ -42,10 +42,7 @@
 require_once 'Zend/Pdf/ElementFactory.php';
 
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/Pdf/Filter/AllTests.php
===================================================================
--- tests/Zend/Pdf/Filter/AllTests.php	(revision 23450)
+++ tests/Zend/Pdf/Filter/AllTests.php	(working copy)
@@ -23,8 +23,6 @@
     define('PHPUnit_MAIN_METHOD', 'Zend_Pdf_Filter_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'Zend/Pdf/Filter/Ascii85Test.php';
 require_once 'Zend/Pdf/Filter/RunLengthTest.php';
Index: tests/Zend/Pdf/Filter/Ascii85Test.php
===================================================================
--- tests/Zend/Pdf/Filter/Ascii85Test.php	(revision 23450)
+++ tests/Zend/Pdf/Filter/Ascii85Test.php	(working copy)
@@ -25,11 +25,6 @@
 require_once 'Zend/Pdf/Filter/Ascii85.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Filter/RunLengthTest.php
===================================================================
--- tests/Zend/Pdf/Filter/RunLengthTest.php	(revision 23450)
+++ tests/Zend/Pdf/Filter/RunLengthTest.php	(working copy)
@@ -25,11 +25,6 @@
 require_once 'Zend/Pdf/Filter/RunLength.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/DestinationTest.php
===================================================================
--- tests/Zend/Pdf/DestinationTest.php	(revision 23450)
+++ tests/Zend/Pdf/DestinationTest.php	(working copy)
@@ -30,9 +30,6 @@
 require_once 'Zend/Pdf.php';
 
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/Pdf/Element/NullTest.php
===================================================================
--- tests/Zend/Pdf/Element/NullTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/NullTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Null.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/StreamTest.php
===================================================================
--- tests/Zend/Pdf/Element/StreamTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/StreamTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Stream.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/ArrayTest.php
===================================================================
--- tests/Zend/Pdf/Element/ArrayTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/ArrayTest.php	(working copy)
@@ -51,11 +51,6 @@
 require_once 'Zend/Pdf/Element/String/Binary.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/BooleanTest.php
===================================================================
--- tests/Zend/Pdf/Element/BooleanTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/BooleanTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Boolean.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/Object/StreamTest.php
===================================================================
--- tests/Zend/Pdf/Element/Object/StreamTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/Object/StreamTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Object/Stream.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/String/BinaryTest.php
===================================================================
--- tests/Zend/Pdf/Element/String/BinaryTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/String/BinaryTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/String/Binary.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/NameTest.php
===================================================================
--- tests/Zend/Pdf/Element/NameTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/NameTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Name.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/NumericTest.php
===================================================================
--- tests/Zend/Pdf/Element/NumericTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/NumericTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Numeric.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/DictionaryTest.php
===================================================================
--- tests/Zend/Pdf/Element/DictionaryTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/DictionaryTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Pdf/Element/Dictionary.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/Element/ObjectTest.php
===================================================================
--- tests/Zend/Pdf/Element/ObjectTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/ObjectTest.php	(working copy)
@@ -26,9 +26,6 @@
 /** Zend_Pdf_Element_Numeric */
 require_once 'Zend/Pdf/Element/Numeric.php';
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/Pdf/Element/StringTest.php
===================================================================
--- tests/Zend/Pdf/Element/StringTest.php	(revision 23450)
+++ tests/Zend/Pdf/Element/StringTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Pdf/Element/String.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Pdf
  * @subpackage UnitTests
Index: tests/Zend/Pdf/FactoryTest.php
===================================================================
--- tests/Zend/Pdf/FactoryTest.php	(revision 23450)
+++ tests/Zend/Pdf/FactoryTest.php	(working copy)
@@ -26,9 +26,6 @@
 /** Zend_Pdf_Page */
 require_once 'Zend/Pdf/Page.php';
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Pdf
Index: tests/Zend/PaginatorTest.php
===================================================================
--- tests/Zend/PaginatorTest.php	(revision 23450)
+++ tests/Zend/PaginatorTest.php	(working copy)
@@ -43,7 +43,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @see Zend_Config_Xml
Index: tests/Zend/OpenId/ProviderTest.php
===================================================================
--- tests/Zend/OpenId/ProviderTest.php	(revision 23450)
+++ tests/Zend/OpenId/ProviderTest.php	(working copy)
@@ -26,12 +26,7 @@
 require_once 'Zend/OpenId/Provider.php';
 
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
 
-
 /**
  * Zend_OpenId_ResponseHelper
  */
Index: tests/Zend/OpenId/ConsumerTest.php
===================================================================
--- tests/Zend/OpenId/ConsumerTest.php	(revision 23450)
+++ tests/Zend/OpenId/ConsumerTest.php	(working copy)
@@ -26,12 +26,7 @@
 require_once 'Zend/OpenId/Consumer.php';
 
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
 
-
 /**
  * Zend_OpenId_ResponseHelper
  */
Index: tests/Zend/OpenId/ExtensionTest.php
===================================================================
--- tests/Zend/OpenId/ExtensionTest.php	(revision 23450)
+++ tests/Zend/OpenId/ExtensionTest.php	(working copy)
@@ -28,11 +28,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
-
-/**
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage UnitTests
Index: tests/Zend/OpenId/Provider/User/SessionTest.php
===================================================================
--- tests/Zend/OpenId/Provider/User/SessionTest.php	(revision 23450)
+++ tests/Zend/OpenId/Provider/User/SessionTest.php	(working copy)
@@ -27,11 +27,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
-
-/**
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage UnitTests
Index: tests/Zend/OpenId/Extension/SregTest.php
===================================================================
--- tests/Zend/OpenId/Extension/SregTest.php	(revision 23450)
+++ tests/Zend/OpenId/Extension/SregTest.php	(working copy)
@@ -27,11 +27,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
-
-/**
  * @category   Zend
  * @package    Zend_OpenId
  * @subpackage UnitTests
Index: tests/Zend/Http/ResponseTest.php
===================================================================
--- tests/Zend/Http/ResponseTest.php	(revision 23450)
+++ tests/Zend/Http/ResponseTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Http/Response.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * Zend_Http_Response unit tests
  *
  * @category   Zend
Index: tests/Zend/Http/CookieJarTest.php
===================================================================
--- tests/Zend/Http/CookieJarTest.php	(revision 23450)
+++ tests/Zend/Http/CookieJarTest.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Http/CookieJar.php';
 
 /**
Index: tests/Zend/Http/Client/SkipTests.php
===================================================================
--- tests/Zend/Http/Client/SkipTests.php	(revision 23450)
+++ tests/Zend/Http/Client/SkipTests.php	(working copy)
@@ -23,11 +23,6 @@
 require_once realpath(dirname(__FILE__) . '/../../../') . '/TestHelper.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Http_Client
  * @subpackage UnitTests
Index: tests/Zend/Http/Client/TestAdapterTest.php
===================================================================
--- tests/Zend/Http/Client/TestAdapterTest.php	(revision 23450)
+++ tests/Zend/Http/Client/TestAdapterTest.php	(working copy)
@@ -24,7 +24,6 @@
 
 require_once 'Zend/Http/Client.php';
 require_once 'Zend/Http/Client/Adapter/Test.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Exercises Zend_Http_Client_Adapter_Test
Index: tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Http/RequestTokenTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Http/RequestToken.php';
 
 class Zend_Oauth_Http_RequestTokenTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Http/UserAuthorizationTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Http/UserAuthorization.php';
 
 class Zend_Oauth_Http_UserAuthorizationTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Http/AccessTokenTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Http/AccessTokenTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Http/AccessTokenTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Http/AccessToken.php';
 
 class Zend_Oauth_Http_AccessTokenTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Http/UtilityTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Http/UtilityTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Http/UtilityTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Http/Utility.php';
 
 class Zend_Oauth_Http_UtilityTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Token/AccessTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Token/AccessTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Token/AccessTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Token/Access.php';
 require_once 'Zend/Oauth/Config.php';
 
Index: tests/Zend/Oauth/Oauth/Token/AuthorizedRequestTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Token/AuthorizedRequestTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Token/AuthorizedRequestTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Token/AuthorizedRequest.php';
 
 class Zend_Oauth_Token_AuthorizedRequestTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Token/RequestTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Token/RequestTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Token/RequestTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Token/Request.php';
 
 class Zend_Oauth_Token_RequestTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Signature/AbstractTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Signature/AbstractTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Signature/AbstractTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Signature/Plaintext.php';
 
 class Zend_Oauth_Signature_AbstractTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Signature/RsaTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Signature/RsaTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Signature/RsaTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 //require_once 'Zend/Oauth/Signature/Rsa.php';
 
 class Zend_Oauth_Signature_RsaTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Signature/HmacTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Signature/HmacTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Signature/HmacTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Signature/Hmac.php';
 
 class Zend_Oauth_Signature_HmacTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/Signature/PlaintextTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/Signature/PlaintextTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/Signature/PlaintextTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Signature/Plaintext.php';
 
 class Zend_Oauth_Signature_PlaintextTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/Oauth/ConsumerTest.php
===================================================================
--- tests/Zend/Oauth/Oauth/ConsumerTest.php	(revision 23450)
+++ tests/Zend/Oauth/Oauth/ConsumerTest.php	(working copy)
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth/Consumer.php';
 
 class Zend_Oauth_ConsumerTest extends PHPUnit_Framework_TestCase
Index: tests/Zend/Oauth/AllTests.php
===================================================================
--- tests/Zend/Oauth/AllTests.php	(revision 23450)
+++ tests/Zend/Oauth/AllTests.php	(working copy)
@@ -6,8 +6,6 @@
 
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'OauthTest.php';
 require_once 'Oauth/ConsumerTest.php';
Index: tests/Zend/Oauth/OauthTest.php
===================================================================
--- tests/Zend/Oauth/OauthTest.php	(revision 23450)
+++ tests/Zend/Oauth/OauthTest.php	(working copy)
@@ -1,7 +1,6 @@
 <?php
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth.php';
 
 class Test_Http_Client_19485876 extends Zend_Http_Client {}
Index: tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php
===================================================================
--- tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php	(revision 23450)
+++ tests/Zend/Gdata/Calendar/EventQueryExceptionTest.php	(working copy)
@@ -23,7 +23,6 @@
 require_once 'Zend/Gdata/Calendar.php';
 require_once 'Zend/Gdata/Calendar/EventQuery.php';
 require_once 'Zend/Http/Client.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Gdata/Gapps/ServiceExceptionTest.php
===================================================================
--- tests/Zend/Gdata/Gapps/ServiceExceptionTest.php	(revision 23450)
+++ tests/Zend/Gdata/Gapps/ServiceExceptionTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Gdata/Gapps/ServiceException.php';
 require_once 'Zend/Gdata/Gapps/Error.php';
 require_once 'Zend/Gdata/Gapps.php';
Index: tests/Zend/Gdata/SkipTests.php
===================================================================
--- tests/Zend/Gdata/SkipTests.php	(revision 23450)
+++ tests/Zend/Gdata/SkipTests.php	(working copy)
@@ -21,11 +21,6 @@
  */
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage UnitTests
Index: tests/Zend/CurrencyTest.php
===================================================================
--- tests/Zend/CurrencyTest.php	(revision 23450)
+++ tests/Zend/CurrencyTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'Zend/Currency.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
-
-/**
  * @category   Zend
  * @package    Zend_Currency
  * @subpackage UnitTests
Index: tests/Zend/Controller/Router/RouteTest.php
===================================================================
--- tests/Zend/Controller/Router/RouteTest.php	(revision 23450)
+++ tests/Zend/Controller/Router/RouteTest.php	(working copy)
@@ -41,9 +41,6 @@
 /** @see Zend_Registry */
 require_once 'Zend/Registry.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Controller
Index: tests/Zend/Controller/Router/RewriteTest.php
===================================================================
--- tests/Zend/Controller/Router/RewriteTest.php	(revision 23450)
+++ tests/Zend/Controller/Router/RewriteTest.php	(working copy)
@@ -50,11 +50,7 @@
 /** Zend_Uri_Http */
 require_once 'Zend/Uri/Http.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-require_once 'PHPUnit/Runner/Version.php';
-
 /**
  * @category   Zend
  * @package    Zend_Controller
@@ -76,7 +72,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_RewriteTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Router/Route/HostnameTest.php
===================================================================
--- tests/Zend/Controller/Router/Route/HostnameTest.php	(revision 23450)
+++ tests/Zend/Controller/Router/Route/HostnameTest.php	(working copy)
@@ -29,9 +29,6 @@
 /** Zend_Controller_Request_Http */
 require_once 'Zend/Controller/Request/Http.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Controller_Router_Route_HostnameTest::main');
 }
@@ -55,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_Route_HostnameTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Router/Route/ChainTest.php
===================================================================
--- tests/Zend/Controller/Router/Route/ChainTest.php	(revision 23450)
+++ tests/Zend/Controller/Router/Route/ChainTest.php	(working copy)
@@ -81,7 +81,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_Route_ChainTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Router/Route/ModuleTest.php
===================================================================
--- tests/Zend/Controller/Router/Route/ModuleTest.php	(revision 23450)
+++ tests/Zend/Controller/Router/Route/ModuleTest.php	(working copy)
@@ -23,8 +23,6 @@
 /** Test helper */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_Controller_Router_Route_Module */
 require_once 'Zend/Controller/Router/Route/Module.php';
@@ -61,7 +59,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_Route_ModuleTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/_files/EmptyController.php
===================================================================
--- tests/Zend/Controller/_files/EmptyController.php	(revision 23450)
+++ tests/Zend/Controller/_files/EmptyController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/Admin/FooBarController.php
===================================================================
--- tests/Zend/Controller/_files/Admin/FooBarController.php	(revision 23450)
+++ tests/Zend/Controller/_files/Admin/FooBarController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/Admin/BazController.php
===================================================================
--- tests/Zend/Controller/_files/Admin/BazController.php	(revision 23450)
+++ tests/Zend/Controller/_files/Admin/BazController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/Admin/FooController.php
===================================================================
--- tests/Zend/Controller/_files/Admin/FooController.php	(revision 23450)
+++ tests/Zend/Controller/_files/Admin/FooController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/ObController.php
===================================================================
--- tests/Zend/Controller/_files/ObController.php	(revision 23450)
+++ tests/Zend/Controller/_files/ObController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/IndexController.php
===================================================================
--- tests/Zend/Controller/_files/IndexController.php	(revision 23450)
+++ tests/Zend/Controller/_files/IndexController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/FooBarController.php
===================================================================
--- tests/Zend/Controller/_files/FooBarController.php	(revision 23450)
+++ tests/Zend/Controller/_files/FooBarController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/Helpers/TestHelper.php
===================================================================
--- tests/Zend/Controller/_files/Helpers/TestHelper.php	(revision 23450)
+++ tests/Zend/Controller/_files/Helpers/TestHelper.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Controller/_files/Helpers/Url.php
===================================================================
--- tests/Zend/Controller/_files/Helpers/Url.php	(revision 23450)
+++ tests/Zend/Controller/_files/Helpers/Url.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Controller/_files/ViewController.php
===================================================================
--- tests/Zend/Controller/_files/ViewController.php	(revision 23450)
+++ tests/Zend/Controller/_files/ViewController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/BazController.php
===================================================================
--- tests/Zend/Controller/_files/BazController.php	(revision 23450)
+++ tests/Zend/Controller/_files/BazController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/ManuallyIncludedControllers.php
===================================================================
--- tests/Zend/Controller/_files/ManuallyIncludedControllers.php	(revision 23450)
+++ tests/Zend/Controller/_files/ManuallyIncludedControllers.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id: ManuallyIncludedControllers.php $
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 require_once 'Zend/Controller/Action.php';
Index: tests/Zend/Controller/_files/modules/foo/controllers/IndexController.php
===================================================================
--- tests/Zend/Controller/_files/modules/foo/controllers/IndexController.php	(revision 23450)
+++ tests/Zend/Controller/_files/modules/foo/controllers/IndexController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/modules/foo/controllers/Admin/IndexController.php
===================================================================
--- tests/Zend/Controller/_files/modules/foo/controllers/Admin/IndexController.php	(revision 23450)
+++ tests/Zend/Controller/_files/modules/foo/controllers/Admin/IndexController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/modules/bar/controllers/IndexController.php
===================================================================
--- tests/Zend/Controller/_files/modules/bar/controllers/IndexController.php	(revision 23450)
+++ tests/Zend/Controller/_files/modules/bar/controllers/IndexController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/FooController.php
===================================================================
--- tests/Zend/Controller/_files/FooController.php	(revision 23450)
+++ tests/Zend/Controller/_files/FooController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Controller/_files/HelperBrokerController.php
===================================================================
--- tests/Zend/Controller/_files/HelperBrokerController.php	(revision 23450)
+++ tests/Zend/Controller/_files/HelperBrokerController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 require_once 'Zend/Controller/Action.php';
Index: tests/Zend/Controller/ActionTest.php
===================================================================
--- tests/Zend/Controller/ActionTest.php	(revision 23450)
+++ tests/Zend/Controller/ActionTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_ActionTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action.php';
 require_once 'Zend/Controller/Action/Helper/Redirector.php';
@@ -54,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_ActionTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Request/Apache404Test.php
===================================================================
--- tests/Zend/Controller/Request/Apache404Test.php	(revision 23450)
+++ tests/Zend/Controller/Request/Apache404Test.php	(working copy)
@@ -25,8 +25,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Request_Apache404Test::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Request/Apache404.php';
 
@@ -58,7 +56,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Request_Apache404Test");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Request/SimpleTest.php
===================================================================
--- tests/Zend/Controller/Request/SimpleTest.php	(revision 23450)
+++ tests/Zend/Controller/Request/SimpleTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Request_SimpleTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Request/Simple.php';
 
@@ -52,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Request_SimpleTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/JsonTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/JsonTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/JsonTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/Json.php';
 
@@ -59,7 +57,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_JsonTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/NamespaceTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/NamespaceTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/NamespaceTest.php	(working copy)
@@ -26,8 +26,6 @@
     define('PHPUnit_MAIN_METHOD', 'Zend_Controller_Action_Helper_NamespaceTest::main');
 }
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
 
 /**
  * Test class for Zend_Controller_Action_Helper_Abstract.
@@ -50,7 +48,6 @@
      */
     public static function main()
     {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
         $suite  = new PHPUnit_Framework_TestSuite('Zend_Controller_Action_Helper_NamespaceTest');
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
Index: tests/Zend/Controller/Action/Helper/AutoCompleteTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/AutoCompleteTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/AutoCompleteTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_AutoCompleteTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/AutoCompleteDojo.php';
 require_once 'Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php';
@@ -62,7 +60,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_AutoCompleteTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/RedirectorTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/RedirectorTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/RedirectorTest.php	(working copy)
@@ -73,7 +73,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_RedirectorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/UrlTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/UrlTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/UrlTest.php	(working copy)
@@ -27,8 +27,6 @@
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/Url.php';
 
@@ -56,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_UrlTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/ActionStackTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/ActionStackTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/ActionStackTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_ActionStackTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/ActionStack.php';
 require_once 'Zend/Controller/Front.php';
@@ -66,7 +64,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_ActionStackTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/CacheTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/CacheTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/CacheTest.php	(working copy)
@@ -5,8 +5,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/Cache.php';
 require_once 'Zend/Controller/Action/HelperBroker.php';
@@ -32,7 +30,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_CacheTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
Index: tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/ContextSwitchTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/ContextSwitchTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_ContextSwitchTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/ContextSwitch.php';
 
@@ -64,7 +62,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_ContextSwitchTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/Helper/AjaxContextTest.php
===================================================================
--- tests/Zend/Controller/Action/Helper/AjaxContextTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/Helper/AjaxContextTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_AjaxContextTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/AjaxContext.php';
 
@@ -62,7 +60,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_AjaxContextTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Action/HelperBrokerTest.php
===================================================================
--- tests/Zend/Controller/Action/HelperBrokerTest.php	(revision 23450)
+++ tests/Zend/Controller/Action/HelperBrokerTest.php	(working copy)
@@ -55,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_HelperBrokerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Plugin/ActionStackTest.php
===================================================================
--- tests/Zend/Controller/Plugin/ActionStackTest.php	(revision 23450)
+++ tests/Zend/Controller/Plugin/ActionStackTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Plugin_ActionStackTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Plugin/ActionStack.php';
 require_once 'Zend/Controller/Request/Simple.php';
@@ -57,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_ActionStackTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Plugin/BrokerTest.php
===================================================================
--- tests/Zend/Controller/Plugin/BrokerTest.php	(revision 23450)
+++ tests/Zend/Controller/Plugin/BrokerTest.php	(working copy)
@@ -33,8 +33,6 @@
     );
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Front.php';
 require_once 'Zend/Controller/Action/HelperBroker.php';
@@ -63,7 +61,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_BrokerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Plugin/PutHandlerTest.php
===================================================================
--- tests/Zend/Controller/Plugin/PutHandlerTest.php	(revision 23450)
+++ tests/Zend/Controller/Plugin/PutHandlerTest.php	(working copy)
@@ -64,7 +64,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_PutHandlerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Plugin/ErrorHandlerTest.php
===================================================================
--- tests/Zend/Controller/Plugin/ErrorHandlerTest.php	(revision 23450)
+++ tests/Zend/Controller/Plugin/ErrorHandlerTest.php	(working copy)
@@ -32,8 +32,6 @@
     );
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Plugin/ErrorHandler.php';
 require_once 'Zend/Controller/Request/Http.php';
@@ -84,7 +82,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_ErrorHandlerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/Response/HttpTest.php
===================================================================
--- tests/Zend/Controller/Response/HttpTest.php	(revision 23450)
+++ tests/Zend/Controller/Response/HttpTest.php	(working copy)
@@ -57,7 +57,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Response_HttpTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Controller/FrontTest.php
===================================================================
--- tests/Zend/Controller/FrontTest.php	(revision 23450)
+++ tests/Zend/Controller/FrontTest.php	(working copy)
@@ -33,8 +33,6 @@
     );
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Front.php';
 require_once 'Zend/Controller/Request/Http.php';
@@ -66,7 +64,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_FrontTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Paginator/Adapter/IteratorTest.php
===================================================================
--- tests/Zend/Paginator/Adapter/IteratorTest.php	(revision 23450)
+++ tests/Zend/Paginator/Adapter/IteratorTest.php	(working copy)
@@ -28,7 +28,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Paginator/Adapter/NullTest.php
===================================================================
--- tests/Zend/Paginator/Adapter/NullTest.php	(revision 23450)
+++ tests/Zend/Paginator/Adapter/NullTest.php	(working copy)
@@ -33,7 +33,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Paginator/Adapter/ArrayTest.php
===================================================================
--- tests/Zend/Paginator/Adapter/ArrayTest.php	(revision 23450)
+++ tests/Zend/Paginator/Adapter/ArrayTest.php	(working copy)
@@ -28,7 +28,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Paginator/Adapter/DbSelectTest.php
===================================================================
--- tests/Zend/Paginator/Adapter/DbSelectTest.php	(revision 23450)
+++ tests/Zend/Paginator/Adapter/DbSelectTest.php	(working copy)
@@ -34,7 +34,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 require_once dirname(__FILE__) . '/../_files/TestTable.php';
 
Index: tests/Zend/Paginator/ScrollingStyle/JumpingTest.php
===================================================================
--- tests/Zend/Paginator/ScrollingStyle/JumpingTest.php	(revision 23450)
+++ tests/Zend/Paginator/ScrollingStyle/JumpingTest.php	(working copy)
@@ -33,7 +33,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Paginator/ScrollingStyle/SlidingTest.php
===================================================================
--- tests/Zend/Paginator/ScrollingStyle/SlidingTest.php	(revision 23450)
+++ tests/Zend/Paginator/ScrollingStyle/SlidingTest.php	(working copy)
@@ -28,7 +28,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @see Zend_Paginator
Index: tests/Zend/Paginator/ScrollingStyle/ElasticTest.php
===================================================================
--- tests/Zend/Paginator/ScrollingStyle/ElasticTest.php	(revision 23450)
+++ tests/Zend/Paginator/ScrollingStyle/ElasticTest.php	(working copy)
@@ -33,7 +33,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @see Zend_Paginator
Index: tests/Zend/Paginator/ScrollingStyle/AllTest.php
===================================================================
--- tests/Zend/Paginator/ScrollingStyle/AllTest.php	(revision 23450)
+++ tests/Zend/Paginator/ScrollingStyle/AllTest.php	(working copy)
@@ -33,7 +33,6 @@
 /**
  * @see PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend
Index: tests/Zend/Db/SkipTests.php
===================================================================
--- tests/Zend/Db/SkipTests.php	(revision 23450)
+++ tests/Zend/Db/SkipTests.php	(working copy)
@@ -20,9 +20,7 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Db/Adapter/SkipTests.php
===================================================================
--- tests/Zend/Db/Adapter/SkipTests.php	(revision 23450)
+++ tests/Zend/Db/Adapter/SkipTests.php	(working copy)
@@ -20,12 +20,7 @@
  * @version    $Id $
  */
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Db
Index: tests/Zend/Db/Adapter/_files/Test/OracleStatement.php
===================================================================
--- tests/Zend/Db/Adapter/_files/Test/OracleStatement.php	(revision 23450)
+++ tests/Zend/Db/Adapter/_files/Test/OracleStatement.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Adapter/_files/Test/Db2Statement.php
===================================================================
--- tests/Zend/Db/Adapter/_files/Test/Db2Statement.php	(revision 23450)
+++ tests/Zend/Db/Adapter/_files/Test/Db2Statement.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Adapter/_files/Test/MysqliStatement.php
===================================================================
--- tests/Zend/Db/Adapter/_files/Test/MysqliStatement.php	(revision 23450)
+++ tests/Zend/Db/Adapter/_files/Test/MysqliStatement.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Adapter/_files/Test/PdoStatement.php
===================================================================
--- tests/Zend/Db/Adapter/_files/Test/PdoStatement.php	(revision 23450)
+++ tests/Zend/Db/Adapter/_files/Test/PdoStatement.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Adapter/_files/Testnamespace/Static.php
===================================================================
--- tests/Zend/Db/Adapter/_files/Testnamespace/Static.php	(revision 23450)
+++ tests/Zend/Db/Adapter/_files/Testnamespace/Static.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Adapter/Static.php
===================================================================
--- tests/Zend/Db/Adapter/Static.php	(revision 23450)
+++ tests/Zend/Db/Adapter/Static.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Profiler/FirebugTest.php
===================================================================
--- tests/Zend/Db/Profiler/FirebugTest.php	(revision 23450)
+++ tests/Zend/Db/Profiler/FirebugTest.php	(working copy)
@@ -26,7 +26,6 @@
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 /** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Db */
 require_once 'Zend/Db.php';
@@ -73,7 +72,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Db_Profiler_FirebugTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Db/Statement/Static.php
===================================================================
--- tests/Zend/Db/Statement/Static.php	(revision 23450)
+++ tests/Zend/Db/Statement/Static.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Statement/StaticTest.php
===================================================================
--- tests/Zend/Db/Statement/StaticTest.php	(revision 23450)
+++ tests/Zend/Db/Statement/StaticTest.php	(working copy)
@@ -20,8 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Db/TestSetup.php
===================================================================
--- tests/Zend/Db/TestSetup.php	(revision 23450)
+++ tests/Zend/Db/TestSetup.php	(working copy)
@@ -39,12 +39,10 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Db/Table/Rowset/StaticTest.php
===================================================================
--- tests/Zend/Db/Table/Rowset/StaticTest.php	(revision 23450)
+++ tests/Zend/Db/Table/Rowset/StaticTest.php	(working copy)
@@ -20,8 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Db/Table/Relationships/StaticTest.php
===================================================================
--- tests/Zend/Db/Table/Relationships/StaticTest.php	(revision 23450)
+++ tests/Zend/Db/Table/Relationships/StaticTest.php	(working copy)
@@ -24,12 +24,10 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Db/Table/Row/StaticTest.php
===================================================================
--- tests/Zend/Db/Table/Row/StaticTest.php	(revision 23450)
+++ tests/Zend/Db/Table/Row/StaticTest.php	(working copy)
@@ -20,8 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Db/Table/StaticTest.php
===================================================================
--- tests/Zend/Db/Table/StaticTest.php	(revision 23450)
+++ tests/Zend/Db/Table/StaticTest.php	(working copy)
@@ -22,8 +22,6 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Db/TestUtil/Common.php
===================================================================
--- tests/Zend/Db/TestUtil/Common.php	(revision 23450)
+++ tests/Zend/Db/TestUtil/Common.php	(working copy)
@@ -29,7 +29,6 @@
 /**
  * PHPUnit_Util_Filter
  */
-require_once 'PHPUnit/Util/Filter.php';
 
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
Index: tests/Zend/Translate/Adapter/CsvTest.php
===================================================================
--- tests/Zend/Translate/Adapter/CsvTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/CsvTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Csv.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/TbxTest.php
===================================================================
--- tests/Zend/Translate/Adapter/TbxTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/TbxTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Tbx.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/IniTest.php
===================================================================
--- tests/Zend/Translate/Adapter/IniTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/IniTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Ini.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/XmlTmTest.php
===================================================================
--- tests/Zend/Translate/Adapter/XmlTmTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/XmlTmTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/XmlTm.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/GettextTest.php
===================================================================
--- tests/Zend/Translate/Adapter/GettextTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/GettextTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Gettext.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/QtTest.php
===================================================================
--- tests/Zend/Translate/Adapter/QtTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/QtTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Qt.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/TmxTest.php
===================================================================
--- tests/Zend/Translate/Adapter/TmxTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/TmxTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Tmx.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Translate/Adapter/XliffTest.php
===================================================================
--- tests/Zend/Translate/Adapter/XliffTest.php	(revision 23450)
+++ tests/Zend/Translate/Adapter/XliffTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Translate/Adapter/Xliff.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage UnitTests
Index: tests/Zend/Markup/ParserIntegrityTest.php
===================================================================
--- tests/Zend/Markup/ParserIntegrityTest.php	(revision 23450)
+++ tests/Zend/Markup/ParserIntegrityTest.php	(working copy)
@@ -46,7 +46,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Markup_MarkupTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Markup/BbcodeAndHtmlTest.php
===================================================================
--- tests/Zend/Markup/BbcodeAndHtmlTest.php	(revision 23450)
+++ tests/Zend/Markup/BbcodeAndHtmlTest.php	(working copy)
@@ -55,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Markup_MarkupTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Markup/TextileAndHtmlTest.php
===================================================================
--- tests/Zend/Markup/TextileAndHtmlTest.php	(revision 23450)
+++ tests/Zend/Markup/TextileAndHtmlTest.php	(working copy)
@@ -56,7 +56,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Markup_MarkupTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Locale/DataTest.php
===================================================================
--- tests/Zend/Locale/DataTest.php	(revision 23450)
+++ tests/Zend/Locale/DataTest.php	(working copy)
@@ -25,12 +25,7 @@
  */
 require_once 'Zend/Locale/Data.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Locale
Index: tests/Zend/Locale/MathTest.php
===================================================================
--- tests/Zend/Locale/MathTest.php	(revision 23450)
+++ tests/Zend/Locale/MathTest.php	(working copy)
@@ -26,12 +26,7 @@
 require_once 'Zend/Locale/Math.php';
 require_once 'Zend/Locale/Math/PhpMath.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Locale
Index: tests/Zend/Uri/HttpTest.php
===================================================================
--- tests/Zend/Uri/HttpTest.php	(revision 23450)
+++ tests/Zend/Uri/HttpTest.php	(working copy)
@@ -35,12 +35,7 @@
  */
 require_once 'Zend/Uri/Http.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Uri
Index: tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php
===================================================================
--- tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php	(revision 23450)
+++ tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Auth/Adapter/Http/AuthTest.php
===================================================================
--- tests/Zend/Auth/Adapter/Http/AuthTest.php	(revision 23450)
+++ tests/Zend/Auth/Adapter/Http/AuthTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Auth/Adapter/Http/ObjectTest.php
===================================================================
--- tests/Zend/Auth/Adapter/Http/ObjectTest.php	(revision 23450)
+++ tests/Zend/Auth/Adapter/Http/ObjectTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Auth/Adapter/DigestTest.php
===================================================================
--- tests/Zend/Auth/Adapter/DigestTest.php	(revision 23450)
+++ tests/Zend/Auth/Adapter/DigestTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php
===================================================================
--- tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php	(revision 23450)
+++ tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php	(working copy)
@@ -25,7 +25,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php
===================================================================
--- tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php	(revision 23450)
+++ tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Zend_OpenId_ResponseHelper
Index: tests/Zend/Server/ReflectionTest.php
===================================================================
--- tests/Zend/Server/ReflectionTest.php	(revision 23450)
+++ tests/Zend/Server/ReflectionTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_Server_Reflection
Index: tests/Zend/Server/Reflection/ReturnValueTest.php
===================================================================
--- tests/Zend/Server/Reflection/ReturnValueTest.php	(revision 23450)
+++ tests/Zend/Server/Reflection/ReturnValueTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection/ReturnValue.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_Server_Reflection_ReturnValue
Index: tests/Zend/Server/Reflection/MethodTest.php
===================================================================
--- tests/Zend/Server/Reflection/MethodTest.php	(revision 23450)
+++ tests/Zend/Server/Reflection/MethodTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection/Method.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 require_once 'Zend/Server/Reflection.php';
 
Index: tests/Zend/Server/Reflection/ParameterTest.php
===================================================================
--- tests/Zend/Server/Reflection/ParameterTest.php	(revision 23450)
+++ tests/Zend/Server/Reflection/ParameterTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection/Parameter.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_Server_Reflection_Parameter
Index: tests/Zend/Server/Reflection/ClassTest.php
===================================================================
--- tests/Zend/Server/Reflection/ClassTest.php	(revision 23450)
+++ tests/Zend/Server/Reflection/ClassTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection/Class.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 require_once 'Zend/Server/Reflection.php';
 
Index: tests/Zend/Server/Reflection/NodeTest.php
===================================================================
--- tests/Zend/Server/Reflection/NodeTest.php	(revision 23450)
+++ tests/Zend/Server/Reflection/NodeTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection/Node.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_Server_Reflection_Node
Index: tests/Zend/Server/Reflection/PrototypeTest.php
===================================================================
--- tests/Zend/Server/Reflection/PrototypeTest.php	(revision 23450)
+++ tests/Zend/Server/Reflection/PrototypeTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/Server/Reflection/Prototype.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 require_once 'Zend/Server/Reflection.php';
 require_once 'Zend/Server/Reflection/Parameter.php';
Index: tests/Zend/View/Helper/ServerUrlTest.php
===================================================================
--- tests/Zend/View/Helper/ServerUrlTest.php	(revision 23450)
+++ tests/Zend/View/Helper/ServerUrlTest.php	(working copy)
@@ -21,7 +21,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Controller/Front.php';
 require_once 'Zend/View/Helper/ServerUrl.php';
 
Index: tests/Zend/View/Helper/HtmlObjectTest.php
===================================================================
--- tests/Zend/View/Helper/HtmlObjectTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HtmlObjectTest.php	(working copy)
@@ -54,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HtmlObjectTest");
         PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/PartialTest.php
===================================================================
--- tests/Zend/View/Helper/PartialTest.php	(revision 23450)
+++ tests/Zend/View/Helper/PartialTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_Partial */
 require_once 'Zend/View/Helper/Partial.php';
@@ -68,7 +66,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_PartialTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/CycleTest.php
===================================================================
--- tests/Zend/View/Helper/CycleTest.php	(revision 23450)
+++ tests/Zend/View/Helper/CycleTest.php	(working copy)
@@ -27,9 +27,7 @@
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
 
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_Cycle */
 require_once 'Zend/View/Helper/Cycle.php';
@@ -59,7 +57,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
         $suite = new PHPUnit_Framework_TestSuite("Zend_View_Helper_CycleTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
Index: tests/Zend/View/Helper/FormTextareaTest.php
===================================================================
--- tests/Zend/View/Helper/FormTextareaTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FormTextareaTest.php	(working copy)
@@ -55,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FormTextareaTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
Index: tests/Zend/View/Helper/HtmlPageTest.php
===================================================================
--- tests/Zend/View/Helper/HtmlPageTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HtmlPageTest.php	(working copy)
@@ -54,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HtmlPageTest");
         PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/FormTest.php
===================================================================
--- tests/Zend/View/Helper/FormTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FormTest.php	(working copy)
@@ -51,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FormTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/InlineScriptTest.php
===================================================================
--- tests/Zend/View/Helper/InlineScriptTest.php	(revision 23450)
+++ tests/Zend/View/Helper/InlineScriptTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_InlineScript */
 require_once 'Zend/View/Helper/InlineScript.php';
@@ -68,7 +66,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_InlineScriptTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/Navigation/TestAbstract.php
===================================================================
--- tests/Zend/View/Helper/Navigation/TestAbstract.php	(revision 23450)
+++ tests/Zend/View/Helper/Navigation/TestAbstract.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Acl.php';
 require_once 'Zend/Acl/Resource.php';
 require_once 'Zend/Acl/Role.php';
Index: tests/Zend/View/Helper/HeadLinkTest.php
===================================================================
--- tests/Zend/View/Helper/HeadLinkTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HeadLinkTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_HeadLink */
 require_once 'Zend/View/Helper/HeadLink.php';
@@ -71,7 +69,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HeadLinkTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/HtmlQuicktimeTest.php
===================================================================
--- tests/Zend/View/Helper/HtmlQuicktimeTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HtmlQuicktimeTest.php	(working copy)
@@ -54,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HtmlQuicktimeTest");
         PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/PlaceholderTest.php
===================================================================
--- tests/Zend/View/Helper/PlaceholderTest.php	(revision 23450)
+++ tests/Zend/View/Helper/PlaceholderTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_Placeholder */
 require_once 'Zend/View/Helper/Placeholder.php';
@@ -63,7 +61,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_PlaceholderTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/HeadStyleTest.php
===================================================================
--- tests/Zend/View/Helper/HeadStyleTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HeadStyleTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_HeadStyle */
 require_once 'Zend/View/Helper/HeadStyle.php';
@@ -68,7 +66,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HeadStyleTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/HtmlFlashTest.php
===================================================================
--- tests/Zend/View/Helper/HtmlFlashTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HtmlFlashTest.php	(working copy)
@@ -54,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HtmlFlashTest");
         PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/PaginationControlTest.php
===================================================================
--- tests/Zend/View/Helper/PaginationControlTest.php	(revision 23450)
+++ tests/Zend/View/Helper/PaginationControlTest.php	(working copy)
@@ -57,7 +57,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite = new PHPUnit_Framework_TestSuite("Zend_View_Helper_PaginationControlTest");
         PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/CurrencyTest.php
===================================================================
--- tests/Zend/View/Helper/CurrencyTest.php	(revision 23450)
+++ tests/Zend/View/Helper/CurrencyTest.php	(working copy)
@@ -61,7 +61,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_CurrencyTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/DeclareVarsTest.php
===================================================================
--- tests/Zend/View/Helper/DeclareVarsTest.php	(revision 23450)
+++ tests/Zend/View/Helper/DeclareVarsTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View.php';
 require_once 'Zend/View/Helper/DeclareVars.php';
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_DeclareVarsTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/Placeholder/ContainerTest.php
===================================================================
--- tests/Zend/View/Helper/Placeholder/ContainerTest.php	(revision 23450)
+++ tests/Zend/View/Helper/Placeholder/ContainerTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_Placeholder_Container */
 require_once 'Zend/View/Helper/Placeholder/Container.php';
@@ -57,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_Placeholder_ContainerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/Placeholder/RegistryTest.php
===================================================================
--- tests/Zend/View/Helper/Placeholder/RegistryTest.php	(revision 23450)
+++ tests/Zend/View/Helper/Placeholder/RegistryTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_Placeholder_Registry */
 require_once 'Zend/View/Helper/Placeholder/Registry.php';
@@ -57,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_Placeholder_RegistryTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/TranslateTest.php
===================================================================
--- tests/Zend/View/Helper/TranslateTest.php	(revision 23450)
+++ tests/Zend/View/Helper/TranslateTest.php	(working copy)
@@ -67,7 +67,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_TranslateTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/FormButtonTest.php
===================================================================
--- tests/Zend/View/Helper/FormButtonTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FormButtonTest.php	(working copy)
@@ -51,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FormButtonTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/FieldsetTest.php
===================================================================
--- tests/Zend/View/Helper/FieldsetTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FieldsetTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View/Helper/Fieldset.php';
 require_once 'Zend/View.php';
@@ -52,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FieldsetTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/HtmlListTest.php
===================================================================
--- tests/Zend/View/Helper/HtmlListTest.php	(revision 23450)
+++ tests/Zend/View/Helper/HtmlListTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View.php';
 require_once 'Zend/View/Helper/HtmlList.php';
@@ -56,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_HtmlListTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/FormErrorsTest.php
===================================================================
--- tests/Zend/View/Helper/FormErrorsTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FormErrorsTest.php	(working copy)
@@ -50,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FormErrorsTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/UrlTest.php
===================================================================
--- tests/Zend/View/Helper/UrlTest.php	(revision 23450)
+++ tests/Zend/View/Helper/UrlTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View.php';
 require_once 'Zend/View/Helper/Url.php';
@@ -60,7 +58,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_UrlTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/FormLabelTest.php
===================================================================
--- tests/Zend/View/Helper/FormLabelTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FormLabelTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View.php';
 require_once 'Zend/View/Helper/FormLabel.php';
@@ -54,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FormLabelTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/DoctypeTest.php
===================================================================
--- tests/Zend/View/Helper/DoctypeTest.php	(revision 23450)
+++ tests/Zend/View/Helper/DoctypeTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_Doctype */
 require_once 'Zend/View/Helper/Doctype.php';
@@ -65,7 +63,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_DoctypeTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/JsonTest.php
===================================================================
--- tests/Zend/View/Helper/JsonTest.php	(revision 23450)
+++ tests/Zend/View/Helper/JsonTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View/Helper/Json.php';
 require_once 'Zend/Controller/Front.php';
@@ -55,7 +53,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_JsonTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/LayoutTest.php
===================================================================
--- tests/Zend/View/Helper/LayoutTest.php	(revision 23450)
+++ tests/Zend/View/Helper/LayoutTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View/Helper/Layout.php';
 require_once 'Zend/Layout.php';
@@ -54,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_LayoutTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/FormRadioTest.php
===================================================================
--- tests/Zend/View/Helper/FormRadioTest.php	(revision 23450)
+++ tests/Zend/View/Helper/FormRadioTest.php	(working copy)
@@ -53,7 +53,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_FormRadioTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/Helper/RenderToPlaceholderTest.php
===================================================================
--- tests/Zend/View/Helper/RenderToPlaceholderTest.php	(revision 23450)
+++ tests/Zend/View/Helper/RenderToPlaceholderTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/View.php';
 require_once 'Zend/View/Helper/Placeholder.php';
Index: tests/Zend/View/Helper/PartialLoopTest.php
===================================================================
--- tests/Zend/View/Helper/PartialLoopTest.php	(revision 23450)
+++ tests/Zend/View/Helper/PartialLoopTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_View_Helper_PartialLoop */
 require_once 'Zend/View/Helper/PartialLoop.php';
@@ -68,7 +66,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_View_Helper_PartialLoopTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/View/_stubs/HelperDir1/StubEmpty.php
===================================================================
--- tests/Zend/View/_stubs/HelperDir1/StubEmpty.php	(revision 23450)
+++ tests/Zend/View/_stubs/HelperDir1/StubEmpty.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/View/_stubs/HelperDir1/Stub1.php
===================================================================
--- tests/Zend/View/_stubs/HelperDir1/Stub1.php	(revision 23450)
+++ tests/Zend/View/_stubs/HelperDir1/Stub1.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/View/_stubs/HelperDir2/Datetime.php
===================================================================
--- tests/Zend/View/_stubs/HelperDir2/Datetime.php	(revision 23450)
+++ tests/Zend/View/_stubs/HelperDir2/Datetime.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/View/_stubs/HelperDir2/Stub1.php
===================================================================
--- tests/Zend/View/_stubs/HelperDir2/Stub1.php	(revision 23450)
+++ tests/Zend/View/_stubs/HelperDir2/Stub1.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/View/_stubs/HelperDir2/Stub2.php
===================================================================
--- tests/Zend/View/_stubs/HelperDir2/Stub2.php	(revision 23450)
+++ tests/Zend/View/_stubs/HelperDir2/Stub2.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/View/_stubs/FilterDir1/Foo.php
===================================================================
--- tests/Zend/View/_stubs/FilterDir1/Foo.php	(revision 23450)
+++ tests/Zend/View/_stubs/FilterDir1/Foo.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Layout/LayoutTest.php
===================================================================
--- tests/Zend/Layout/LayoutTest.php	(revision 23450)
+++ tests/Zend/Layout/LayoutTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Layout.php';
 require_once 'Zend/Layout/Controller/Plugin/Layout.php';
@@ -57,7 +55,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Layout_LayoutTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Layout/PluginTest.php
===================================================================
--- tests/Zend/Layout/PluginTest.php	(revision 23450)
+++ tests/Zend/Layout/PluginTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Layout/Controller/Plugin/Layout.php';
 require_once 'Zend/Layout.php';
@@ -55,7 +53,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Layout_PluginTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Layout/HelperTest.php
===================================================================
--- tests/Zend/Layout/HelperTest.php	(revision 23450)
+++ tests/Zend/Layout/HelperTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Layout/Controller/Action/Helper/Layout.php';
 require_once 'Zend/Layout.php';
@@ -53,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Layout_HelperTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Layout/FunctionalTest.php
===================================================================
--- tests/Zend/Layout/FunctionalTest.php	(revision 23450)
+++ tests/Zend/Layout/FunctionalTest.php	(working copy)
@@ -47,7 +47,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/MimeTest.php
===================================================================
--- tests/Zend/MimeTest.php	(revision 23450)
+++ tests/Zend/MimeTest.php	(working copy)
@@ -31,9 +31,6 @@
 /** Zend_Mime */
 require_once 'Zend/Mime.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Mime
Index: tests/Zend/Mail/InterfaceTest.php
===================================================================
--- tests/Zend/Mail/InterfaceTest.php	(revision 23450)
+++ tests/Zend/Mail/InterfaceTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Mail/Storage/Mbox.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage UnitTests
Index: tests/Zend/Mail/MboxMessageOldTest.php
===================================================================
--- tests/Zend/Mail/MboxMessageOldTest.php	(revision 23450)
+++ tests/Zend/Mail/MboxMessageOldTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Config.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * Maildir class, which uses old message class
  *
  * @category   Zend
Index: tests/Zend/Mail/MaildirWritableTest.php
===================================================================
--- tests/Zend/Mail/MaildirWritableTest.php	(revision 23450)
+++ tests/Zend/Mail/MaildirWritableTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Mail/Storage/Writable/Maildir.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage UnitTests
Index: tests/Zend/Mail/MaildirFolderTest.php
===================================================================
--- tests/Zend/Mail/MaildirFolderTest.php	(revision 23450)
+++ tests/Zend/Mail/MaildirFolderTest.php	(working copy)
@@ -30,12 +30,7 @@
  */
 require_once 'Zend/Config.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Mail
Index: tests/Zend/Mail/MaildirTest.php
===================================================================
--- tests/Zend/Mail/MaildirTest.php	(revision 23450)
+++ tests/Zend/Mail/MaildirTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Config.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage UnitTests
Index: tests/Zend/Mail/Pop3Test.php
===================================================================
--- tests/Zend/Mail/Pop3Test.php	(revision 23450)
+++ tests/Zend/Mail/Pop3Test.php	(working copy)
@@ -36,11 +36,6 @@
 require_once 'Zend/Config.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage UnitTests
Index: tests/Zend/Mail/SmtpTest.php
===================================================================
--- tests/Zend/Mail/SmtpTest.php	(revision 23450)
+++ tests/Zend/Mail/SmtpTest.php	(working copy)
@@ -33,11 +33,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * Test helper for configuration when run standalone
  */
 require_once dirname(__FILE__).'/../../TestHelper.php';
Index: tests/Zend/Mail/MessageTest.php
===================================================================
--- tests/Zend/Mail/MessageTest.php	(revision 23450)
+++ tests/Zend/Mail/MessageTest.php	(working copy)
@@ -36,11 +36,6 @@
 require_once 'Zend/Mime/Decode.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage UnitTests
Index: tests/Zend/Mail/MaildirMessageOldTest.php
===================================================================
--- tests/Zend/Mail/MaildirMessageOldTest.php	(revision 23450)
+++ tests/Zend/Mail/MaildirMessageOldTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Config.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * Maildir class, which uses old message class
  *
  * @category   Zend
Index: tests/Zend/Mail/SmtpOfflineTest.php
===================================================================
--- tests/Zend/Mail/SmtpOfflineTest.php	(revision 23450)
+++ tests/Zend/Mail/SmtpOfflineTest.php	(working copy)
@@ -38,11 +38,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * Test helper for configuration when run standalone
  */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
Index: tests/Zend/Mail/ImapTest.php
===================================================================
--- tests/Zend/Mail/ImapTest.php	(revision 23450)
+++ tests/Zend/Mail/ImapTest.php	(working copy)
@@ -35,12 +35,7 @@
  */
 require_once 'Zend/Config.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Mail
Index: tests/Zend/Queue/Adapter/ActivemqTest.php
===================================================================
--- tests/Zend/Queue/Adapter/ActivemqTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/ActivemqTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/NullTest.php
===================================================================
--- tests/Zend/Queue/Adapter/NullTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/NullTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/StompIOTest.php
===================================================================
--- tests/Zend/Queue/Adapter/StompIOTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/StompIOTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/ArrayTest.php
===================================================================
--- tests/Zend/Queue/Adapter/ArrayTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/ArrayTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/AdapterTest.php
===================================================================
--- tests/Zend/Queue/Adapter/AdapterTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/AdapterTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/StompTest.php
===================================================================
--- tests/Zend/Queue/Adapter/StompTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/StompTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/MemcacheqTest.php
===================================================================
--- tests/Zend/Queue/Adapter/MemcacheqTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/MemcacheqTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Adapter/PlatformJobQueueTest.php
===================================================================
--- tests/Zend/Queue/Adapter/PlatformJobQueueTest.php	(revision 23450)
+++ tests/Zend/Queue/Adapter/PlatformJobQueueTest.php	(working copy)
@@ -21,9 +21,6 @@
  */
 
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/Bugs/ZF-7650Test.php
===================================================================
--- tests/Zend/Queue/Bugs/ZF-7650Test.php	(revision 23450)
+++ tests/Zend/Queue/Bugs/ZF-7650Test.php	(working copy)
@@ -24,9 +24,6 @@
  * This code specifically tests for ZF-7650
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/CustomTest.php
===================================================================
--- tests/Zend/Queue/CustomTest.php	(revision 23450)
+++ tests/Zend/Queue/CustomTest.php	(working copy)
@@ -25,9 +25,6 @@
  * documentation code.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
Index: tests/Zend/Queue/Stomp/FrameTest.php
===================================================================
--- tests/Zend/Queue/Stomp/FrameTest.php	(revision 23450)
+++ tests/Zend/Queue/Stomp/FrameTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
Index: tests/Zend/Queue/MessageTest.php
===================================================================
--- tests/Zend/Queue/MessageTest.php	(revision 23450)
+++ tests/Zend/Queue/MessageTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
Index: tests/Zend/Queue/QueueTest.php
===================================================================
--- tests/Zend/Queue/QueueTest.php	(revision 23450)
+++ tests/Zend/Queue/QueueTest.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
Index: tests/Zend/Queue/Queue1Test.php
===================================================================
--- tests/Zend/Queue/Queue1Test.php	(revision 23450)
+++ tests/Zend/Queue/Queue1Test.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
Index: tests/Zend/Queue/Queue2Test.php
===================================================================
--- tests/Zend/Queue/Queue2Test.php	(revision 23450)
+++ tests/Zend/Queue/Queue2Test.php	(working copy)
@@ -28,9 +28,6 @@
  * an exception.
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
Index: tests/Zend/Queue/FactoryTest.php
===================================================================
--- tests/Zend/Queue/FactoryTest.php	(revision 23450)
+++ tests/Zend/Queue/FactoryTest.php	(working copy)
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /** Zend_Queue */
 require_once 'Zend/Queue.php';
 
Index: tests/Zend/Filter/StripTagsTest.php
===================================================================
--- tests/Zend/Filter/StripTagsTest.php	(revision 23450)
+++ tests/Zend/Filter/StripTagsTest.php	(working copy)
@@ -60,7 +60,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php
===================================================================
--- tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_CamelCaseToUnderscoreTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/CamelCaseToUnderscore.php';
 
@@ -50,7 +48,6 @@
      * @static
      */
     public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_CamelCaseToUnderscoreTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php
===================================================================
--- tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_UnderscoreToCamelCaseTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/UnderscoreToCamelCase.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_UnderscoreToCamelCaseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/DashToUnderscoreTest.php
===================================================================
--- tests/Zend/Filter/Word/DashToUnderscoreTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/DashToUnderscoreTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_DashToUnderscoreTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/DashToUnderscore.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_DashToUnderscoreTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/UnderscoreToDashTest.php
===================================================================
--- tests/Zend/Filter/Word/UnderscoreToDashTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/UnderscoreToDashTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_UnderscoreToDashTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/UnderscoreToDash.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_UnderscoreToDashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php
===================================================================
--- tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_UnderscoreToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/UnderscoreToSeparator.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_UnderscoreToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/CamelCaseToDashTest.php
===================================================================
--- tests/Zend/Filter/Word/CamelCaseToDashTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/CamelCaseToDashTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_CamelCaseToDashTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/CamelCaseToDash.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_CamelCaseToDashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/DashToCamelCaseTest.php
===================================================================
--- tests/Zend/Filter/Word/DashToCamelCaseTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/DashToCamelCaseTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_DashToCamelCaseTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/DashToCamelCase.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_DashToCamelCaseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php
===================================================================
--- tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_CamelCaseToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/CamelCaseToSeparator.php';
 
@@ -50,7 +48,6 @@
      * @static
      */
     public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_CamelCaseToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php
===================================================================
--- tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_SeparatorToCamelCaseTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/SeparatorToCamelCase.php';
 
@@ -50,7 +48,6 @@
      * @static
      */
     public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_SeparatorToCamelCaseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/DashToSeparatorTest.php
===================================================================
--- tests/Zend/Filter/Word/DashToSeparatorTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/DashToSeparatorTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_DashToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/DashToSeparator.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_DashToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/SeparatorToDashTest.php
===================================================================
--- tests/Zend/Filter/Word/SeparatorToDashTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/SeparatorToDashTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_SeparatorToDashTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/SeparatorToDash.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_SeparatorToDashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Filter/Word/SeparatorToSeparatorTest.php
===================================================================
--- tests/Zend/Filter/Word/SeparatorToSeparatorTest.php	(revision 23450)
+++ tests/Zend/Filter/Word/SeparatorToSeparatorTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_SeparatorToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_SeparatorToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/InfoCard/CipherTest.php
===================================================================
--- tests/Zend/InfoCard/CipherTest.php	(revision 23450)
+++ tests/Zend/InfoCard/CipherTest.php	(working copy)
@@ -30,8 +30,6 @@
  */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/InfoCard.php';
 require_once 'Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php';
Index: tests/Zend/InfoCard/ProcessTest.php
===================================================================
--- tests/Zend/InfoCard/ProcessTest.php	(revision 23450)
+++ tests/Zend/InfoCard/ProcessTest.php	(working copy)
@@ -30,8 +30,6 @@
  */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/InfoCard.php';
 require_once 'Zend/InfoCard/Adapter/Default.php';
@@ -56,7 +54,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_InfoCard_ProcessTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/InfoCard/XmlParsingTest.php
===================================================================
--- tests/Zend/InfoCard/XmlParsingTest.php	(revision 23450)
+++ tests/Zend/InfoCard/XmlParsingTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/InfoCard/Xml/EncryptedData.php';
 require_once 'Zend/InfoCard/Xml/SecurityTokenReference.php';
@@ -52,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_InfoCard_XmlParsingTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/InfoCard/AssertionTest.php
===================================================================
--- tests/Zend/InfoCard/AssertionTest.php	(revision 23450)
+++ tests/Zend/InfoCard/AssertionTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/InfoCard.php';
 
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_InfoCard_AssertionTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Mime/MessageTest.php
===================================================================
--- tests/Zend/Mime/MessageTest.php	(revision 23450)
+++ tests/Zend/Mime/MessageTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Mime/Message.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mime
  * @subpackage UnitTests
Index: tests/Zend/Mime/PartTest.php
===================================================================
--- tests/Zend/Mime/PartTest.php	(revision 23450)
+++ tests/Zend/Mime/PartTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Mime/Part.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Mime
  * @subpackage UnitTests
Index: tests/Zend/LoaderTest.php
===================================================================
--- tests/Zend/LoaderTest.php	(revision 23450)
+++ tests/Zend/LoaderTest.php	(working copy)
@@ -57,7 +57,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_LoaderTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Navigation/PageTest.php
===================================================================
--- tests/Zend/Navigation/PageTest.php	(revision 23450)
+++ tests/Zend/Navigation/PageTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Navigation/Page.php';
 require_once 'Zend/Config.php';
 
Index: tests/Zend/Navigation/ContainerTest.php
===================================================================
--- tests/Zend/Navigation/ContainerTest.php	(revision 23450)
+++ tests/Zend/Navigation/ContainerTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Navigation.php';
 require_once 'Zend/Config.php';
 
Index: tests/Zend/Navigation/PageFactoryTest.php
===================================================================
--- tests/Zend/Navigation/PageFactoryTest.php	(revision 23450)
+++ tests/Zend/Navigation/PageFactoryTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Navigation/Page.php';
 
 /**
Index: tests/Zend/Navigation/Page/UriTest.php
===================================================================
--- tests/Zend/Navigation/Page/UriTest.php	(revision 23450)
+++ tests/Zend/Navigation/Page/UriTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Navigation/Page/Uri.php';
 
 /**
Index: tests/Zend/Navigation/Page/MvcTest.php
===================================================================
--- tests/Zend/Navigation/Page/MvcTest.php	(revision 23450)
+++ tests/Zend/Navigation/Page/MvcTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Navigation/Page/Mvc.php';
 require_once 'Zend/Controller/Request/Http.php';
 require_once 'Zend/Controller/Router/Route.php';
Index: tests/Zend/_files/_testDir2/Class2.php
===================================================================
--- tests/Zend/_files/_testDir2/Class2.php	(revision 23450)
+++ tests/Zend/_files/_testDir2/Class2.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/_files/_testDir1/Class4.php
===================================================================
--- tests/Zend/_files/_testDir1/Class4.php	(revision 23450)
+++ tests/Zend/_files/_testDir1/Class4.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/_files/_testDir1/Class1/Subclass2.php
===================================================================
--- tests/Zend/_files/_testDir1/Class1/Subclass2.php	(revision 23450)
+++ tests/Zend/_files/_testDir1/Class1/Subclass2.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/_files/_testDir1/Interface1.php
===================================================================
--- tests/Zend/_files/_testDir1/Interface1.php	(revision 23450)
+++ tests/Zend/_files/_testDir1/Interface1.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/_files/_testDir1/ClassNonexistent.php
===================================================================
--- tests/Zend/_files/_testDir1/ClassNonexistent.php	(revision 23450)
+++ tests/Zend/_files/_testDir1/ClassNonexistent.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/_files/_testDir1/Class1.php
===================================================================
--- tests/Zend/_files/_testDir1/Class1.php	(revision 23450)
+++ tests/Zend/_files/_testDir1/Class1.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/_files/_testDir1/Class3.php
===================================================================
--- tests/Zend/_files/_testDir1/Class3.php	(revision 23450)
+++ tests/Zend/_files/_testDir1/Class3.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Measure/AccelerationTest.php
===================================================================
--- tests/Zend/Measure/AccelerationTest.php	(revision 23450)
+++ tests/Zend/Measure/AccelerationTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Locale.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/CapacitanceTest.php
===================================================================
--- tests/Zend/Measure/CapacitanceTest.php	(revision 23450)
+++ tests/Zend/Measure/CapacitanceTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Capacitance.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/PowerTest.php
===================================================================
--- tests/Zend/Measure/PowerTest.php	(revision 23450)
+++ tests/Zend/Measure/PowerTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Power.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/TimeTest.php
===================================================================
--- tests/Zend/Measure/TimeTest.php	(revision 23450)
+++ tests/Zend/Measure/TimeTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Time.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/ForceTest.php
===================================================================
--- tests/Zend/Measure/ForceTest.php	(revision 23450)
+++ tests/Zend/Measure/ForceTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Force.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/SpeedTest.php
===================================================================
--- tests/Zend/Measure/SpeedTest.php	(revision 23450)
+++ tests/Zend/Measure/SpeedTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Speed.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/LightnessTest.php
===================================================================
--- tests/Zend/Measure/LightnessTest.php	(revision 23450)
+++ tests/Zend/Measure/LightnessTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Lightness.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/FrequencyTest.php
===================================================================
--- tests/Zend/Measure/FrequencyTest.php	(revision 23450)
+++ tests/Zend/Measure/FrequencyTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Frequency.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Cooking/VolumeTest.php
===================================================================
--- tests/Zend/Measure/Cooking/VolumeTest.php	(revision 23450)
+++ tests/Zend/Measure/Cooking/VolumeTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Cooking/Volume.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Cooking/WeightTest.php
===================================================================
--- tests/Zend/Measure/Cooking/WeightTest.php	(revision 23450)
+++ tests/Zend/Measure/Cooking/WeightTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Cooking/Weight.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/IlluminationTest.php
===================================================================
--- tests/Zend/Measure/IlluminationTest.php	(revision 23450)
+++ tests/Zend/Measure/IlluminationTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Illumination.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Viscosity/DynamicTest.php
===================================================================
--- tests/Zend/Measure/Viscosity/DynamicTest.php	(revision 23450)
+++ tests/Zend/Measure/Viscosity/DynamicTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Viscosity/Dynamic.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Viscosity/KinematicTest.php
===================================================================
--- tests/Zend/Measure/Viscosity/KinematicTest.php	(revision 23450)
+++ tests/Zend/Measure/Viscosity/KinematicTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Viscosity/Kinematic.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/VolumeTest.php
===================================================================
--- tests/Zend/Measure/VolumeTest.php	(revision 23450)
+++ tests/Zend/Measure/VolumeTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Volume.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/AreaTest.php
===================================================================
--- tests/Zend/Measure/AreaTest.php	(revision 23450)
+++ tests/Zend/Measure/AreaTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Area.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/PressureTest.php
===================================================================
--- tests/Zend/Measure/PressureTest.php	(revision 23450)
+++ tests/Zend/Measure/PressureTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Pressure.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/DensityTest.php
===================================================================
--- tests/Zend/Measure/DensityTest.php	(revision 23450)
+++ tests/Zend/Measure/DensityTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Density.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/TorqueTest.php
===================================================================
--- tests/Zend/Measure/TorqueTest.php	(revision 23450)
+++ tests/Zend/Measure/TorqueTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Torque.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Flow/MoleTest.php
===================================================================
--- tests/Zend/Measure/Flow/MoleTest.php	(revision 23450)
+++ tests/Zend/Measure/Flow/MoleTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Flow/Mole.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Flow/MassTest.php
===================================================================
--- tests/Zend/Measure/Flow/MassTest.php	(revision 23450)
+++ tests/Zend/Measure/Flow/MassTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Flow/Mass.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/Flow/VolumeTest.php
===================================================================
--- tests/Zend/Measure/Flow/VolumeTest.php	(revision 23450)
+++ tests/Zend/Measure/Flow/VolumeTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Flow/Volume.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/LengthTest.php
===================================================================
--- tests/Zend/Measure/LengthTest.php	(revision 23450)
+++ tests/Zend/Measure/LengthTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Length.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/CurrentTest.php
===================================================================
--- tests/Zend/Measure/CurrentTest.php	(revision 23450)
+++ tests/Zend/Measure/CurrentTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Current.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/BinaryTest.php
===================================================================
--- tests/Zend/Measure/BinaryTest.php	(revision 23450)
+++ tests/Zend/Measure/BinaryTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Measure/Binary.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/AngleTest.php
===================================================================
--- tests/Zend/Measure/AngleTest.php	(revision 23450)
+++ tests/Zend/Measure/AngleTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Angle.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/WeightTest.php
===================================================================
--- tests/Zend/Measure/WeightTest.php	(revision 23450)
+++ tests/Zend/Measure/WeightTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Weight.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Measure/NumberTest.php
===================================================================
--- tests/Zend/Measure/NumberTest.php	(revision 23450)
+++ tests/Zend/Measure/NumberTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Measure/Number.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Measure
  * @subpackage UnitTests
Index: tests/Zend/Console/GetoptTest.php
===================================================================
--- tests/Zend/Console/GetoptTest.php	(revision 23450)
+++ tests/Zend/Console/GetoptTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Console/Getopt.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Console_Getopt
  * @subpackage UnitTests
Index: tests/Zend/Form/_files/decorators/Label.php
===================================================================
--- tests/Zend/Form/_files/decorators/Label.php	(revision 23450)
+++ tests/Zend/Form/_files/decorators/Label.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 require_once 'Zend/Form/Decorator/Abstract.php';
Index: tests/Zend/Form/_files/decorators/TableRow.php
===================================================================
--- tests/Zend/Form/_files/decorators/TableRow.php	(revision 23450)
+++ tests/Zend/Form/_files/decorators/TableRow.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 require_once 'Zend/Form/Decorator/Abstract.php';
Index: tests/Zend/Form/Decorator/CallbackTest.php
===================================================================
--- tests/Zend/Form/Decorator/CallbackTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/CallbackTest.php	(working copy)
@@ -49,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_CallbackTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/FieldsetTest.php
===================================================================
--- tests/Zend/Form/Decorator/FieldsetTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/FieldsetTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Fieldset.php';
 
@@ -54,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_FieldsetTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/HtmlTagTest.php
===================================================================
--- tests/Zend/Form/Decorator/HtmlTagTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/HtmlTagTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/HtmlTag.php';
 
@@ -53,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_HtmlTagTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/AbstractTest.php
===================================================================
--- tests/Zend/Form/Decorator/AbstractTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/AbstractTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Errors.php';
 
@@ -58,7 +56,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_AbstractTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/ViewHelperTest.php
===================================================================
--- tests/Zend/Form/Decorator/ViewHelperTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/ViewHelperTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/ViewHelper.php';
 
@@ -54,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_ViewHelperTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/ErrorsTest.php
===================================================================
--- tests/Zend/Form/Decorator/ErrorsTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/ErrorsTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Errors.php';
 
@@ -53,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_ErrorsTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/LabelTest.php
===================================================================
--- tests/Zend/Form/Decorator/LabelTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/LabelTest.php	(working copy)
@@ -52,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_LabelTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/FileTest.php
===================================================================
--- tests/Zend/Form/Decorator/FileTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/FileTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/File.php';
 
@@ -53,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_FileTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/ImageTest.php
===================================================================
--- tests/Zend/Form/Decorator/ImageTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/ImageTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Image.php';
 
@@ -55,7 +53,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_ImageTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Decorator/DescriptionTest.php
===================================================================
--- tests/Zend/Form/Decorator/DescriptionTest.php	(revision 23450)
+++ tests/Zend/Form/Decorator/DescriptionTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Description.php';
 
@@ -53,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_DescriptionTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/SubFormTest.php
===================================================================
--- tests/Zend/Form/SubFormTest.php	(revision 23450)
+++ tests/Zend/Form/SubFormTest.php	(working copy)
@@ -25,8 +25,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
 
 // error_reporting(E_ALL);
 
@@ -46,7 +44,6 @@
 {
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
         $suite  = new PHPUnit_Framework_TestSuite('Zend_Form_SubFormTest');
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
Index: tests/Zend/Form/Element/HiddenTest.php
===================================================================
--- tests/Zend/Form/Element/HiddenTest.php	(revision 23450)
+++ tests/Zend/Form/Element/HiddenTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Element/Hidden.php';
 
@@ -50,7 +48,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_HiddenTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/PasswordTest.php
===================================================================
--- tests/Zend/Form/Element/PasswordTest.php	(revision 23450)
+++ tests/Zend/Form/Element/PasswordTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Element/Password.php';
 require_once 'Zend/View.php';
@@ -51,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_PasswordTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/CaptchaTest.php
===================================================================
--- tests/Zend/Form/Element/CaptchaTest.php	(revision 23450)
+++ tests/Zend/Form/Element/CaptchaTest.php	(working copy)
@@ -45,7 +45,6 @@
 {
     public static function main()
     {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
 
         $suite  = new PHPUnit_Framework_TestSuite('Zend_Form_Element_CaptchaTest');
         PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/SubmitTest.php
===================================================================
--- tests/Zend/Form/Element/SubmitTest.php	(revision 23450)
+++ tests/Zend/Form/Element/SubmitTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Element/Submit.php';
 require_once 'Zend/Form.php';
@@ -54,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_SubmitTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/ButtonTest.php
===================================================================
--- tests/Zend/Form/Element/ButtonTest.php	(revision 23450)
+++ tests/Zend/Form/Element/ButtonTest.php	(working copy)
@@ -49,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_ButtonTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/TextareaTest.php
===================================================================
--- tests/Zend/Form/Element/TextareaTest.php	(revision 23450)
+++ tests/Zend/Form/Element/TextareaTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Element/Textarea.php';
 
@@ -50,7 +48,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_TextareaTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/ResetTest.php
===================================================================
--- tests/Zend/Form/Element/ResetTest.php	(revision 23450)
+++ tests/Zend/Form/Element/ResetTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Element/Reset.php';
 
@@ -50,7 +48,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_ResetTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/HashTest.php
===================================================================
--- tests/Zend/Form/Element/HashTest.php	(revision 23450)
+++ tests/Zend/Form/Element/HashTest.php	(working copy)
@@ -48,7 +48,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_HashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Form/Element/TextTest.php
===================================================================
--- tests/Zend/Form/Element/TextTest.php	(revision 23450)
+++ tests/Zend/Form/Element/TextTest.php	(working copy)
@@ -26,8 +26,6 @@
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Element/Text.php';
 
@@ -50,7 +48,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_TextTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Captcha/ImageTest.php
===================================================================
--- tests/Zend/Captcha/ImageTest.php	(revision 23450)
+++ tests/Zend/Captcha/ImageTest.php	(working copy)
@@ -49,7 +49,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Captcha_ImageTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/XmlRpc/FaultTest.php
===================================================================
--- tests/Zend/XmlRpc/FaultTest.php	(revision 23450)
+++ tests/Zend/XmlRpc/FaultTest.php	(working copy)
@@ -21,8 +21,6 @@
  */
 
 require_once 'Zend/XmlRpc/Fault.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_XmlRpc_Fault
Index: tests/Zend/XmlRpc/ValueTest.php
===================================================================
--- tests/Zend/XmlRpc/ValueTest.php	(revision 23450)
+++ tests/Zend/XmlRpc/ValueTest.php	(working copy)
@@ -19,8 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/XmlRpc/Value.php';
 require_once 'Zend/XmlRpc/Value/Scalar.php';
Index: tests/Zend/XmlRpc/ResponseTest.php
===================================================================
--- tests/Zend/XmlRpc/ResponseTest.php	(revision 23450)
+++ tests/Zend/XmlRpc/ResponseTest.php	(working copy)
@@ -22,8 +22,6 @@
 
 require_once dirname(__FILE__)."/../../TestHelper.php";
 require_once 'Zend/XmlRpc/Response.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_XmlRpc_Response
Index: tests/Zend/XmlRpc/Server/FaultTest.php
===================================================================
--- tests/Zend/XmlRpc/Server/FaultTest.php	(revision 23450)
+++ tests/Zend/XmlRpc/Server/FaultTest.php	(working copy)
@@ -26,8 +26,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_XmlRpc_Server_FaultTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/XmlRpc/Server.php';
 require_once 'Zend/XmlRpc/Server/Fault.php';
@@ -52,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_XmlRpc_Server_FaultTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/XmlRpc/GeneratorTest.php
===================================================================
--- tests/Zend/XmlRpc/GeneratorTest.php	(revision 23450)
+++ tests/Zend/XmlRpc/GeneratorTest.php	(working copy)
@@ -20,8 +20,6 @@
  * @version $Id: ValueTest.php 18442 2009-09-30 13:17:48Z lars $
  */
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 require_once 'Zend/XmlRpc/TestProvider.php';
 
 /**
Index: tests/Zend/XmlRpc/RequestTest.php
===================================================================
--- tests/Zend/XmlRpc/RequestTest.php	(revision 23450)
+++ tests/Zend/XmlRpc/RequestTest.php	(working copy)
@@ -24,8 +24,6 @@
 require_once 'Zend/XmlRpc/Value/Nil.php';
 require_once 'Zend/XmlRpc/Value/String.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
 
 /**
  * Test case for Zend_XmlRpc_Request
Index: tests/Zend/Wildfire/_files/IndexController.php
===================================================================
--- tests/Zend/Wildfire/_files/IndexController.php	(revision 23450)
+++ tests/Zend/Wildfire/_files/IndexController.php	(working copy)
@@ -20,7 +20,6 @@
  * @version   $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Loader/_files/ZfTest/CacheTest.php
===================================================================
--- tests/Zend/Loader/_files/ZfTest/CacheTest.php	(revision 23450)
+++ tests/Zend/Loader/_files/ZfTest/CacheTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Loader/_files/ZfTest/FormSubmit.php
===================================================================
--- tests/Zend/Loader/_files/ZfTest/FormSubmit.php	(revision 23450)
+++ tests/Zend/Loader/_files/ZfTest/FormSubmit.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Loader/MyLoader.php
===================================================================
--- tests/Zend/Loader/MyLoader.php	(revision 23450)
+++ tests/Zend/Loader/MyLoader.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once 'Zend/Loader.php';
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Loader/AutoloadableClass.php
===================================================================
--- tests/Zend/Loader/AutoloadableClass.php	(revision 23450)
+++ tests/Zend/Loader/AutoloadableClass.php	(working copy)
@@ -28,7 +28,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 class Zend_Loader_AutoloadableClass
Index: tests/Zend/Loader/PluginLoaderTest.php
===================================================================
--- tests/Zend/Loader/PluginLoaderTest.php	(revision 23450)
+++ tests/Zend/Loader/PluginLoaderTest.php	(working copy)
@@ -53,7 +53,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Loader_PluginLoaderTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Loader/MyOverloader.php
===================================================================
--- tests/Zend/Loader/MyOverloader.php	(revision 23450)
+++ tests/Zend/Loader/MyOverloader.php	(working copy)
@@ -25,7 +25,6 @@
  */
 require_once 'Zend/Loader.php';
 
-require_once 'PHPUnit/Util/Filter.php';
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
Index: tests/Zend/Validate/IdenticalTest.php
===================================================================
--- tests/Zend/Validate/IdenticalTest.php	(revision 23450)
+++ tests/Zend/Validate/IdenticalTest.php	(working copy)
@@ -45,7 +45,6 @@
 {
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
         $suite  = new PHPUnit_Framework_TestSuite('Zend_Validate_IdenticalTest');
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
Index: tests/Zend/Validate/Db/NoRecordExistsTest.php
===================================================================
--- tests/Zend/Validate/Db/NoRecordExistsTest.php	(revision 23450)
+++ tests/Zend/Validate/Db/NoRecordExistsTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Validate/Db/RecordExistsTest.php
===================================================================
--- tests/Zend/Validate/Db/RecordExistsTest.php	(revision 23450)
+++ tests/Zend/Validate/Db/RecordExistsTest.php	(working copy)
@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**
Index: tests/Zend/Validate/Sitemap/LocTest.php
===================================================================
--- tests/Zend/Validate/Sitemap/LocTest.php	(revision 23450)
+++ tests/Zend/Validate/Sitemap/LocTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Validate/Sitemap/Loc.php';
 
 /**
Index: tests/Zend/Validate/Sitemap/PriorityTest.php
===================================================================
--- tests/Zend/Validate/Sitemap/PriorityTest.php	(revision 23450)
+++ tests/Zend/Validate/Sitemap/PriorityTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Validate/Sitemap/Priority.php';
 
 /**
Index: tests/Zend/Validate/Sitemap/ChangefreqTest.php
===================================================================
--- tests/Zend/Validate/Sitemap/ChangefreqTest.php	(revision 23450)
+++ tests/Zend/Validate/Sitemap/ChangefreqTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Validate/Sitemap/Changefreq.php';
 
 /**
Index: tests/Zend/Validate/Sitemap/LastmodTest.php
===================================================================
--- tests/Zend/Validate/Sitemap/LastmodTest.php	(revision 23450)
+++ tests/Zend/Validate/Sitemap/LastmodTest.php	(working copy)
@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Validate/Sitemap/Lastmod.php';
 
 /**
Index: tests/Zend/Amf/AuthTest.php
===================================================================
--- tests/Zend/Amf/AuthTest.php	(revision 23450)
+++ tests/Zend/Amf/AuthTest.php	(working copy)
@@ -25,7 +25,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Amf_AuthTest::main");
 }
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Server.php';
 require_once 'Zend/Amf/Request.php';
Index: tests/Zend/Amf/ResourceTest.php
===================================================================
--- tests/Zend/Amf/ResourceTest.php	(revision 23450)
+++ tests/Zend/Amf/ResourceTest.php	(working copy)
@@ -25,7 +25,6 @@
     define("PHPUnit_MAIN_METHOD", "Zend_Amf_ResourceTest::main");
 }
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Server.php';
 require_once 'Zend/Amf/Request.php';
Index: tests/Zend/Cache/SkipTests.php
===================================================================
--- tests/Zend/Cache/SkipTests.php	(revision 23450)
+++ tests/Zend/Cache/SkipTests.php	(working copy)
@@ -23,9 +23,7 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
Index: tests/Zend/Cache/TwoLevelsBackendTest.php
===================================================================
--- tests/Zend/Cache/TwoLevelsBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/TwoLevelsBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/StaticBackendTest.php
===================================================================
--- tests/Zend/Cache/StaticBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/StaticBackendTest.php	(working copy)
@@ -22,11 +22,6 @@
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @package    Zend_Cache
  * @subpackage UnitTests
  */
Index: tests/Zend/Cache/CommonBackendTest.php
===================================================================
--- tests/Zend/Cache/CommonBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/CommonBackendTest.php	(working copy)
@@ -20,16 +20,10 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/OutputFrontendTest.php
===================================================================
--- tests/Zend/Cache/OutputFrontendTest.php	(revision 23450)
+++ tests/Zend/Cache/OutputFrontendTest.php	(working copy)
@@ -28,11 +28,6 @@
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/ZendServerDiskTest.php
===================================================================
--- tests/Zend/Cache/ZendServerDiskTest.php	(revision 23450)
+++ tests/Zend/Cache/ZendServerDiskTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/XcacheBackendTest.php
===================================================================
--- tests/Zend/Cache/XcacheBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/XcacheBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/ClassFrontendTest.php
===================================================================
--- tests/Zend/Cache/ClassFrontendTest.php	(revision 23450)
+++ tests/Zend/Cache/ClassFrontendTest.php	(working copy)
@@ -28,11 +28,6 @@
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @todo: Should this class be named Zend_Cache_Something?
  *
  * @category   Zend
Index: tests/Zend/Cache/LibmemcachedBackendTest.php
===================================================================
--- tests/Zend/Cache/LibmemcachedBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/LibmemcachedBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/FactoryTest.php
===================================================================
--- tests/Zend/Cache/FactoryTest.php	(revision 23450)
+++ tests/Zend/Cache/FactoryTest.php	(working copy)
@@ -25,12 +25,7 @@
  */
 require_once 'Zend/Cache.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
 
-
 require_once 'Zend/Cache/Backend/File.php';
 class Zend_Cache_Backend_FooBarTest extends Zend_Cache_Backend_File { }
 class FooBarTestBackend extends Zend_Cache_Backend_File { }
Index: tests/Zend/Cache/SqliteBackendTest.php
===================================================================
--- tests/Zend/Cache/SqliteBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/SqliteBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/ApcBackendTest.php
===================================================================
--- tests/Zend/Cache/ApcBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/ApcBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/PageFrontendTest.php
===================================================================
--- tests/Zend/Cache/PageFrontendTest.php	(revision 23450)
+++ tests/Zend/Cache/PageFrontendTest.php	(working copy)
@@ -28,11 +28,6 @@
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/ZendPlatformBackendTest.php
===================================================================
--- tests/Zend/Cache/ZendPlatformBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/ZendPlatformBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/MemcachedBackendTest.php
===================================================================
--- tests/Zend/Cache/MemcachedBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/MemcachedBackendTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/FileFrontendTest.php
===================================================================
--- tests/Zend/Cache/FileFrontendTest.php	(revision 23450)
+++ tests/Zend/Cache/FileFrontendTest.php	(working copy)
@@ -28,11 +28,6 @@
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/CommonExtendedBackendTest.php
===================================================================
--- tests/Zend/Cache/CommonExtendedBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/CommonExtendedBackendTest.php	(working copy)
@@ -20,16 +20,10 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @see Zend_Cache_CommonBackendTest
  */
 require_once 'CommonBackendTest.php';
Index: tests/Zend/Cache/ZendServerShMemTest.php
===================================================================
--- tests/Zend/Cache/ZendServerShMemTest.php	(revision 23450)
+++ tests/Zend/Cache/ZendServerShMemTest.php	(working copy)
@@ -32,11 +32,6 @@
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/FunctionFrontendTest.php
===================================================================
--- tests/Zend/Cache/FunctionFrontendTest.php	(revision 23450)
+++ tests/Zend/Cache/FunctionFrontendTest.php	(working copy)
@@ -27,11 +27,6 @@
 require_once 'Zend/Cache/Frontend/Function.php';
 require_once 'Zend/Cache/Backend/Test.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 function foobar($param1, $param2) {
     echo "foobar_output($param1, $param2)";
     return "foobar_return($param1, $param2)";
Index: tests/Zend/Cache/FileBackendTest.php
===================================================================
--- tests/Zend/Cache/FileBackendTest.php	(revision 23450)
+++ tests/Zend/Cache/FileBackendTest.php	(working copy)
@@ -38,11 +38,6 @@
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
Index: tests/Zend/Cache/CoreTest.php
===================================================================
--- tests/Zend/Cache/CoreTest.php	(revision 23450)
+++ tests/Zend/Cache/CoreTest.php	(working copy)
@@ -28,11 +28,6 @@
 require_once 'Zend/Cache/Backend/File.php'; // TODO : use only Test backend ?
 require_once 'Zend/Cache/Backend/Test.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 require_once 'Zend/Config.php';
 
 /**
Index: tests/Zend/Search/Lucene/SearchHighlightTest.php
===================================================================
--- tests/Zend/Search/Lucene/SearchHighlightTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/SearchHighlightTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/SearchTest.php
===================================================================
--- tests/Zend/Search/Lucene/SearchTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/SearchTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Search23Test.php
===================================================================
--- tests/Zend/Search/Lucene/Search23Test.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Search23Test.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/DocumentTest.php
===================================================================
--- tests/Zend/Search/Lucene/DocumentTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/DocumentTest.php	(working copy)
@@ -41,11 +41,6 @@
 require_once 'Zend/Search/Lucene/Document/Xlsx.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Storage/FileTest.php
===================================================================
--- tests/Zend/Search/Lucene/Storage/FileTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Storage/FileTest.php	(working copy)
@@ -31,11 +31,6 @@
 require_once 'Zend/Search/Lucene/Storage/File/Memory.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Storage/DirectoryTest.php
===================================================================
--- tests/Zend/Search/Lucene/Storage/DirectoryTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Storage/DirectoryTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Storage/Directory/Filesystem.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/DictionaryLoaderTest.php	(working copy)
@@ -37,11 +37,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/SegmentInfoTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/SegmentInfoTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/SegmentInfoTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Index/SegmentInfo.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/FieldInfoTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/FieldInfoTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/FieldInfoTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Index/FieldInfo.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/TermsPriorityQueueTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/TermsPriorityQueueTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/TermsPriorityQueueTest.php	(working copy)
@@ -36,11 +36,6 @@
 require_once 'Zend/Search/Lucene/Index/TermsPriorityQueue.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/TermInfoTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/TermInfoTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/TermInfoTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Index/TermInfo.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/SegmentMergerTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/SegmentMergerTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/SegmentMergerTest.php	(working copy)
@@ -37,11 +37,6 @@
 require_once 'Zend/Search/Lucene/Index/SegmentMerger.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/Index/TermTest.php
===================================================================
--- tests/Zend/Search/Lucene/Index/TermTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/Index/TermTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Index/Term.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/FieldTest.php
===================================================================
--- tests/Zend/Search/Lucene/FieldTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/FieldTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Field.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/AnalysisTest.php
===================================================================
--- tests/Zend/Search/Lucene/AnalysisTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/AnalysisTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/FSMTest.php
===================================================================
--- tests/Zend/Search/Lucene/FSMTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/FSMTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/FSM.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Search/Lucene/PriorityQueueTest.php
===================================================================
--- tests/Zend/Search/Lucene/PriorityQueueTest.php	(revision 23450)
+++ tests/Zend/Search/Lucene/PriorityQueueTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Search/Lucene/PriorityQueue.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Search_Lucene
  * @subpackage UnitTests
Index: tests/Zend/Json/JsonXMLTest.php
===================================================================
--- tests/Zend/Json/JsonXMLTest.php	(revision 23450)
+++ tests/Zend/Json/JsonXMLTest.php	(working copy)
@@ -28,11 +28,6 @@
 require_once 'Zend/Json.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
-
-/**
  * @category   Zend
  * @package    Zend_Json
  * @subpackage UnitTests
Index: tests/Zend/Json/Server/ErrorTest.php
===================================================================
--- tests/Zend/Json/Server/ErrorTest.php	(revision 23450)
+++ tests/Zend/Json/Server/ErrorTest.php	(working copy)
@@ -50,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_Server_ErrorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Json/Server/Smd/ServiceTest.php
===================================================================
--- tests/Zend/Json/Server/Smd/ServiceTest.php	(revision 23450)
+++ tests/Zend/Json/Server/Smd/ServiceTest.php	(working copy)
@@ -51,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_Server_Smd_ServiceTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Json/Server/ResponseTest.php
===================================================================
--- tests/Zend/Json/Server/ResponseTest.php	(revision 23450)
+++ tests/Zend/Json/Server/ResponseTest.php	(working copy)
@@ -51,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_Server_ResponseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Json/Server/CacheTest.php
===================================================================
--- tests/Zend/Json/Server/CacheTest.php	(revision 23450)
+++ tests/Zend/Json/Server/CacheTest.php	(working copy)
@@ -50,7 +50,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_Server_CacheTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Json/Server/SmdTest.php
===================================================================
--- tests/Zend/Json/Server/SmdTest.php	(revision 23450)
+++ tests/Zend/Json/Server/SmdTest.php	(working copy)
@@ -51,7 +51,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_Server_SmdTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Json/Server/RequestTest.php
===================================================================
--- tests/Zend/Json/Server/RequestTest.php	(revision 23450)
+++ tests/Zend/Json/Server/RequestTest.php	(working copy)
@@ -48,7 +48,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_Server_RequestTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Json/ServerTest.php
===================================================================
--- tests/Zend/Json/ServerTest.php	(revision 23450)
+++ tests/Zend/Json/ServerTest.php	(working copy)
@@ -52,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Json_ServerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Rest/ClientTest.php
===================================================================
--- tests/Zend/Rest/ClientTest.php	(revision 23450)
+++ tests/Zend/Rest/ClientTest.php	(working copy)
@@ -28,9 +28,6 @@
 /** Zend_Http_Client_Adapter_Test */
 require_once 'Zend/Http/Client/Adapter/Test.php';
 
-/** PHPUnit Test Case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * Test cases for Zend_Rest_Client
  *
Index: tests/Zend/Rest/ResultTest.php
===================================================================
--- tests/Zend/Rest/ResultTest.php	(revision 23450)
+++ tests/Zend/Rest/ResultTest.php	(working copy)
@@ -26,11 +26,6 @@
 require_once 'Zend/Rest/Client/Result.php';
 
 /**
- * PHPUnit Test Case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * Test cases for Zend_Rest_Server
  *
  * @category   Zend
Index: tests/Zend/Rest/RouteTest.php
===================================================================
--- tests/Zend/Rest/RouteTest.php	(revision 23450)
+++ tests/Zend/Rest/RouteTest.php	(working copy)
@@ -23,8 +23,6 @@
 /** Test helper */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_Rest_Route */
 require_once 'Zend/Rest/Route.php';
@@ -63,7 +61,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Rest_RouteTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Rest/ControllerTest.php
===================================================================
--- tests/Zend/Rest/ControllerTest.php	(revision 23450)
+++ tests/Zend/Rest/ControllerTest.php	(working copy)
@@ -23,8 +23,6 @@
 /** Test helper */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_Rest_Controller */
 require_once 'Zend/Rest/Controller.php';
@@ -102,7 +100,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Rest_ControllerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
Index: tests/Zend/Rest/ServerTest.php
===================================================================
--- tests/Zend/Rest/ServerTest.php	(revision 23450)
+++ tests/Zend/Rest/ServerTest.php	(working copy)
@@ -52,7 +52,6 @@
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Rest_ServerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);