diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
index 9b035afeac..cbd99ae444 100644
--- a/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
+++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
@@ -22,8 +22,17 @@
 
 if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery41.php');
+
+    class Zend_Test_PHPUnit_Constraint_DomQuery extends Zend_Test_PHPUnit_Constraint_DomQuery41
+    {}
 } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery37.php');
+
+    class Zend_Test_PHPUnit_Constraint_DomQuery extends Zend_Test_PHPUnit_Constraint_DomQuery37
+    {}
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery34.php');
+
+    class Zend_Test_PHPUnit_Constraint_DomQuery extends Zend_Test_PHPUnit_Constraint_DomQuery34
+    {}
 }
diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php
index ae3eb07a3c..99b277a4c9 100644
--- a/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php
+++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_DomQuery34 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
index 045f52b849..5826111cb1 100644
--- a/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
+++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_DomQuery37 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php
index 91f6ef69d4..4ca252e574 100644
--- a/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php
+++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_DomQuery41 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect.php b/library/Zend/Test/PHPUnit/Constraint/Redirect.php
index b7451a3238..1eb9bb77bf 100644
--- a/library/Zend/Test/PHPUnit/Constraint/Redirect.php
+++ b/library/Zend/Test/PHPUnit/Constraint/Redirect.php
@@ -22,8 +22,17 @@
 
 if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect41.php');
+
+    class Zend_Test_PHPUnit_Constraint_Redirect extends Zend_Test_PHPUnit_Constraint_Redirect41
+    {}
 } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect37.php');
+
+    class Zend_Test_PHPUnit_Constraint_Redirect extends Zend_Test_PHPUnit_Constraint_Redirect37
+    {}
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect34.php');
+
+    class Zend_Test_PHPUnit_Constraint_Redirect extends Zend_Test_PHPUnit_Constraint_Redirect34
+    {}
 }
diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect34.php b/library/Zend/Test/PHPUnit/Constraint/Redirect34.php
index d0f80ff2c7..fbff07de3f 100644
--- a/library/Zend/Test/PHPUnit/Constraint/Redirect34.php
+++ b/library/Zend/Test/PHPUnit/Constraint/Redirect34.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_Redirect34 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect37.php b/library/Zend/Test/PHPUnit/Constraint/Redirect37.php
index a6cd1aca88..063f1800ee 100644
--- a/library/Zend/Test/PHPUnit/Constraint/Redirect37.php
+++ b/library/Zend/Test/PHPUnit/Constraint/Redirect37.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_Redirect37 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect41.php b/library/Zend/Test/PHPUnit/Constraint/Redirect41.php
index c471b274ef..9d921bf393 100644
--- a/library/Zend/Test/PHPUnit/Constraint/Redirect41.php
+++ b/library/Zend/Test/PHPUnit/Constraint/Redirect41.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_Redirect41 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php
index 636700acff..3d8c2efaff 100644
--- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php
+++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php
@@ -22,8 +22,17 @@
 
 if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader41.php');
+
+    class Zend_Test_PHPUnit_Constraint_ResponseHeader extends Zend_Test_PHPUnit_Constraint_ResponseHeader41
+    {}
 } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader37.php');
+
+    class Zend_Test_PHPUnit_Constraint_ResponseHeader extends Zend_Test_PHPUnit_Constraint_ResponseHeader37
+    {}
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader34.php');
+
+    class Zend_Test_PHPUnit_Constraint_ResponseHeader extends Zend_Test_PHPUnit_Constraint_ResponseHeader34
+    {}
 }
diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php
index 3b0545d4ca..cb9eb64b47 100644
--- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php
+++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_ResponseHeader34 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php
index 3f7738d965..5c81ca7681 100644
--- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php
+++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_ResponseHeader37 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants
diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
index efacefa93c..05c2f921b3 100644
--- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
+++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_ResponseHeader41 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants