diff --git a/framework/Test/lib/Horde/Test/AllTests.php b/framework/Test/lib/Horde/Test/AllTests.php
index 5ab3be4647a..c3816c7e95c 100644
--- a/framework/Test/lib/Horde/Test/AllTests.php
+++ b/framework/Test/lib/Horde/Test/AllTests.php
@@ -104,7 +104,7 @@ public function suite()
             if ($file->isFile()) {
                 $pathname = $file->getPathname();
                 if ((preg_match('/Test.php$/', $file->getFilename())) &&
-                    (include $pathname)) {
+                    (include_once $pathname)) {
                     $class = str_replace(
                         DIRECTORY_SEPARATOR, '_',
                         preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname));
diff --git a/framework/Test/package.xml b/framework/Test/package.xml
index 464d71b229e..30c52af5c4c 100644
--- a/framework/Test/package.xml
+++ b/framework/Test/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix AllTests.php when dealing with test cases that inherit from parent test cases.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2541,7 +2541,7 @@
    <date>2014-07-01</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix AllTests.php when dealing with test cases that inherit from parent test cases.
    </notes>
   </release>
  </changelog>