diff --git a/package.xml b/package.xml
index 44816e1..86970bb 100644
--- a/package.xml
+++ b/package.xml
@@ -338,7 +338,6 @@
       <file name="AllTests.php" role="test" />
       <file name="bootstrap.php" role="test" />
       <file name="DateTest.php" role="test" />
-      <file name="phpunit.xml" role="test" />
       <file name="RecurrenceTest.php" role="test" />
       <file name="SpanTest.php" role="test" />
       <file name="UtilsTest.php" role="test" />
@@ -504,7 +503,6 @@
    <install as="Horde/Date/AllTests.php" name="test/Horde/Date/AllTests.php" />
    <install as="Horde/Date/bootstrap.php" name="test/Horde/Date/bootstrap.php" />
    <install as="Horde/Date/DateTest.php" name="test/Horde/Date/DateTest.php" />
-   <install as="Horde/Date/phpunit.xml" name="test/Horde/Date/phpunit.xml" />
    <install as="Horde/Date/RecurrenceTest.php" name="test/Horde/Date/RecurrenceTest.php" />
    <install as="Horde/Date/SpanTest.php" name="test/Horde/Date/SpanTest.php" />
    <install as="Horde/Date/UtilsTest.php" name="test/Horde/Date/UtilsTest.php" />
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..376111c
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+<phpunit bootstrap="test/Horde/Date/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/Date/phpunit.xml b/test/Horde/Date/phpunit.xml
deleted file mode 100644
index 5dcbab2..0000000
--- a/test/Horde/Date/phpunit.xml
+++ /dev/null
@@ -1 +0,0 @@
-<phpunit bootstrap="bootstrap.php"></phpunit>