diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php
index e96f24ed284ee..47a6f95f747c7 100644
--- a/lib/private/AppFramework/Utility/SimpleContainer.php
+++ b/lib/private/AppFramework/Utility/SimpleContainer.php
@@ -66,13 +66,7 @@ private function buildClass(ReflectionClass $class) {
 
 				try {
 					$parameters[] = $this->query($resolveName);
-				} catch (\Exception $e) {
-					if (class_exists('PHPUnit_Framework_AssertionFailedError', false) &&
-						$e instanceof \PHPUnit_Framework_AssertionFailedError) {
-						// Easier debugging of "Your test case is not allowed to access the database."
-						throw $e;
-					}
-
+				} catch (QueryException $e) {
 					// Service not found, use the default value when available
 					if ($parameter->isDefaultValueAvailable()) {
 						$parameters[] = $parameter->getDefaultValue();