diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
index 1e31086ded..cbdb4cabb4 100644
--- a/app/phpunit.xml.dist
+++ b/app/phpunit.xml.dist
@@ -11,7 +11,7 @@
     processIsolation            = "false"
     stopOnFailure               = "false"
     syntaxCheck                 = "false"
-    bootstrap                   = "bootstrap.php.cache" >
+    bootstrap                   = "tests.bootstrap.php" >
 
     <testsuites>
         <testsuite name="Project Test Suite">
@@ -26,6 +26,12 @@
     </php>
     -->
 
+    <!--
+    <php>
+        <env name="BOOTSTRAP_CLEAR_CACHE_ENV" value="test"/>
+    </php>
+    -->
+
     <filter>
         <whitelist>
             <directory>../src</directory>
diff --git a/app/tests.bootstrap.php b/app/tests.bootstrap.php
new file mode 100644
index 0000000000..dc0d918f5a
--- /dev/null
+++ b/app/tests.bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+if (isset($_ENV['BOOTSTRAP_CLEAR_CACHE_ENV'])) {
+    passthru(sprintf('php "%s" cache:clear --env=%s --no-warmup', __DIR__.'/console', $_ENV['BOOTSTRAP_CLEAR_CACHE_ENV']));
+}
+
+return require __DIR__.'/bootstrap.php.cache';