diff --git a/package.xml b/package.xml
index 547a231..2e2683e 100644
--- a/package.xml
+++ b/package.xml
@@ -81,7 +81,6 @@
       <file name="AllTests.php" role="test" />
       <file name="bootstrap.php" role="test" />
       <file name="conf.php.dist" role="test" />
-      <file name="phpunit.xml" role="test" />
       <file name="TestBase.php" role="test" />
      </dir> <!-- /test/Horde/History -->
     </dir> <!-- /test/Horde -->
@@ -158,7 +157,6 @@
    <install as="Horde/History/AllTests.php" name="test/Horde/History/AllTests.php" />
    <install as="Horde/History/bootstrap.php" name="test/Horde/History/bootstrap.php" />
    <install as="Horde/History/conf.php.dist" name="test/Horde/History/conf.php.dist" />
-   <install as="Horde/History/phpunit.xml" name="test/Horde/History/phpunit.xml" />
    <install as="Horde/History/TestBase.php" name="test/Horde/History/TestBase.php" />
    <install as="Horde/History/Mock/MockTest.php" name="test/Horde/History/Mock/MockTest.php" />
    <install as="Horde/History/Mongo/MongoTest.php" name="test/Horde/History/Mongo/MongoTest.php" />
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..251d112
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+<phpunit bootstrap="test/Horde/History/bootstrap.php" colors="true">
+  <testsuites>
+    <testsuite>
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">lib</directory>
+    </whitelist>
+  </filter>
+</phpunit>
\ No newline at end of file
diff --git a/test/Horde/History/phpunit.xml b/test/Horde/History/phpunit.xml
deleted file mode 100644
index 25e5f68..0000000
--- a/test/Horde/History/phpunit.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="bootstrap.php"></phpunit>