diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bb28c1090724..4612898794ea 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -25,6 +25,9 @@
             <directory suffix=".php">./app</directory>
         </whitelist>
     </filter>
+    <listeners>
+        <listener class="CachetHQ\Tests\Cachet\TestListener" file="./tests/TestListener.php" />
+    </listeners>
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="APP_DEBUG" value="true"/>
diff --git a/tests/TestListener.php b/tests/TestListener.php
new file mode 100644
index 000000000000..fd18c7d72442
--- /dev/null
+++ b/tests/TestListener.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Tests\Cachet;
+
+use PHPUnit_Framework_BaseTestListener;
+use PHPUnit_Framework_TestSuite;
+
+/**
+ * This is the test listener class.
+ *
+ * @author Connor S. Parks <connor@connorvg.tv>
+ */
+class TestListener extends PHPUnit_Framework_BaseTestListener
+{
+    /**
+     * A test suite ended.
+     *
+     * @since Method available since Release 2.2.0
+     *
+     * @param \PHPUnit_Framework_TestSuite $suite
+     *
+     * @return void
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        if ($suite->getName() !== 'Cachet Test Suite') {
+            return;
+        }
+
+        foreach (glob(__DIR__.'/../bootstrap/cache/*.php') as $file) {
+            unlink($file);
+        }
+    }
+}