diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f28871bc9..89047e61ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.1 - TBD
+## 3.0.1 - 2016-06-15
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#26](https://github.com/zendframework/zend-test/pull/26) fixes how
+  `$traceErrors` works under PHP 7 and PHPUnit 5. Any zend-test-specific
+  assertion failures now append a list of all exception messages to the base
+  message when the flag is enabled.
 
 ## 3.0.0 - 2016-05-31
 
diff --git a/src/PHPUnit/Controller/AbstractConsoleControllerTestCase.php b/src/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
index e30d948ac9..c8a5913b8e 100644
--- a/src/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
+++ b/src/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
@@ -29,13 +29,13 @@ public function assertConsoleOutputContains($match)
     {
         $response = $this->getResponse();
         if (false === stripos($response->getContent(), $match)) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf(
                     'Failed asserting output CONTAINS content "%s", actual content is "%s"',
                     $match,
                     $response->getContent()
                 )
-            );
+            ));
         }
         $this->assertNotSame(false, stripos($response->getContent(), $match));
     }
@@ -50,10 +50,10 @@ public function assertNotConsoleOutputContains($match)
     {
         $response = $this->getResponse();
         if (false !== stripos($response->getContent(), $match)) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting output DOES NOT CONTAIN content "%s"',
                 $match
-            ));
+            )));
         }
         $this->assertSame(false, stripos($response->getContent(), $match));
     }
diff --git a/src/PHPUnit/Controller/AbstractControllerTestCase.php b/src/PHPUnit/Controller/AbstractControllerTestCase.php
index b36c4152fc..7e98167941 100644
--- a/src/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/src/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -65,15 +65,39 @@ protected function setUp()
     protected function tearDown()
     {
         Console::overrideIsConsole($this->usedConsoleBackup);
+    }
 
+    /**
+     * Create a failure message.
+     *
+     * If $traceError is true, appends exception details, if any.
+     *
+     * @param string $message
+     * @return string
+     */
+    protected function createFailureMessage($message)
+    {
         if (true !== $this->traceError) {
-            return;
+            return $message;
         }
 
         $exception = $this->getApplication()->getMvcEvent()->getParam('exception');
-        if ($exception instanceof \Exception) {
-            throw $exception;
-        }
+        if (! $exception instanceof \Throwable && ! $exception instanceof \Exception) {
+            return $message;
+        }
+
+        $messages = [];
+        do {
+            $messages[] = sprintf(
+                "Exception '%s' with message '%s' in %s:%d",
+                get_class($exception),
+                $exception->getMessage(),
+                $exception->getFile(),
+                $exception->getLine()
+            );
+        } while ($exception = $exception->getPrevious());
+
+        return sprintf("%s\n\nExceptions raised:\n%s\n", $message, implode("\n\n", $messages));
     }
 
     /**
@@ -356,9 +380,9 @@ public function assertModulesLoaded(array $modules)
         $modulesLoaded = $moduleManager->getModules();
         $list          = array_diff($modules, $modulesLoaded);
         if ($list) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Several modules are not loaded "%s"', implode(', ', $list))
-            );
+            ));
         }
         $this->assertEquals(count($list), 0);
     }
@@ -374,9 +398,9 @@ public function assertNotModulesLoaded(array $modules)
         $modulesLoaded = $moduleManager->getModules();
         $list          = array_intersect($modules, $modulesLoaded);
         if ($list) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Several modules WAS not loaded "%s"', implode(', ', $list))
-            );
+            ));
         }
         $this->assertEquals(count($list), 0);
     }
@@ -410,16 +434,16 @@ public function assertResponseStatusCode($code)
     {
         if ($this->useConsoleRequest) {
             if (!in_array($code, [0, 1])) {
-                throw new PHPUnit_Framework_ExpectationFailedException(
+                throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                     'Console status code assert value must be O (valid) or 1 (error)'
-                );
+                ));
             }
         }
         $match = $this->getResponseStatusCode();
         if ($code != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting response code "%s", actual status code is "%s"', $code, $match)
-            );
+            ));
         }
         $this->assertEquals($code, $match);
     }
@@ -433,16 +457,16 @@ public function assertNotResponseStatusCode($code)
     {
         if ($this->useConsoleRequest) {
             if (!in_array($code, [0, 1])) {
-                throw new PHPUnit_Framework_ExpectationFailedException(
+                throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                     'Console status code assert value must be O (valid) or 1 (error)'
-                );
+                ));
             }
         }
         $match = $this->getResponseStatusCode();
         if ($code == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting response code was NOT "%s"', $code)
-            );
+            ));
         }
         $this->assertNotEquals($code, $match);
     }
@@ -457,9 +481,9 @@ public function assertApplicationException($type, $message = null)
     {
         $exception = $this->getApplication()->getMvcEvent()->getParam('exception');
         if (!$exception) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 'Failed asserting application exception, exception not exist'
-            );
+            ));
         }
         if (true === $this->traceError) {
             // set exception as null because we know and have assert the exception
@@ -478,7 +502,7 @@ protected function getControllerFullClassName()
     {
         $routeMatch           = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $controllerIdentifier = $routeMatch->getParam('controller');
         $controllerManager    = $this->getApplicationServiceLocator()->get('ControllerManager');
@@ -499,9 +523,9 @@ public function assertModuleName($module)
         $match           = strtolower($match);
         $module          = strtolower($module);
         if ($module != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting module name "%s", actual module name is "%s"', $module, $match)
-            );
+            ));
         }
         $this->assertEquals($module, $match);
     }
@@ -518,9 +542,9 @@ public function assertNotModuleName($module)
         $match           = strtolower($match);
         $module          = strtolower($module);
         if ($module == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting module was NOT "%s"', $module)
-            );
+            ));
         }
         $this->assertNotEquals($module, $match);
     }
@@ -537,9 +561,9 @@ public function assertControllerClass($controller)
         $match           = strtolower($match);
         $controller      = strtolower($controller);
         if ($controller != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting controller class "%s", actual controller class is "%s"', $controller, $match)
-            );
+            ));
         }
         $this->assertEquals($controller, $match);
     }
@@ -556,9 +580,9 @@ public function assertNotControllerClass($controller)
         $match           = strtolower($match);
         $controller      = strtolower($controller);
         if ($controller == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting controller class was NOT "%s"', $controller)
-            );
+            ));
         }
         $this->assertNotEquals($controller, $match);
     }
@@ -572,15 +596,15 @@ public function assertControllerName($controller)
     {
         $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $match      = $routeMatch->getParam('controller');
         $match      = strtolower($match);
         $controller = strtolower($controller);
         if ($controller != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting controller name "%s", actual controller name is "%s"', $controller, $match)
-            );
+            ));
         }
         $this->assertEquals($controller, $match);
     }
@@ -594,15 +618,15 @@ public function assertNotControllerName($controller)
     {
         $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $match      = $routeMatch->getParam('controller');
         $match      = strtolower($match);
         $controller = strtolower($controller);
         if ($controller == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting controller name was NOT "%s"', $controller)
-            );
+            ));
         }
         $this->assertNotEquals($controller, $match);
     }
@@ -616,15 +640,15 @@ public function assertActionName($action)
     {
         $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $match      = $routeMatch->getParam('action');
         $match      = strtolower($match);
         $action     = strtolower($action);
         if ($action != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting action name "%s", actual action name is "%s"', $action, $match)
-            );
+            ));
         }
         $this->assertEquals($action, $match);
     }
@@ -638,15 +662,15 @@ public function assertNotActionName($action)
     {
         $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $match      = $routeMatch->getParam('action');
         $match      = strtolower($match);
         $action     = strtolower($action);
         if ($action == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting action name was NOT "%s"', $action)
-            );
+            ));
         }
         $this->assertNotEquals($action, $match);
     }
@@ -660,15 +684,15 @@ public function assertMatchedRouteName($route)
     {
         $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $match      = $routeMatch->getMatchedRouteName();
         $match      = strtolower($match);
         $route      = strtolower($route);
         if ($route != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting matched route name was "%s", actual matched route name is "%s"', $route, $match)
-            );
+            ));
         }
         $this->assertEquals($route, $match);
     }
@@ -682,15 +706,15 @@ public function assertNotMatchedRouteName($route)
     {
         $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
         if (!$routeMatch) {
-            throw new PHPUnit_Framework_ExpectationFailedException('No route matched');
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage('No route matched'));
         }
         $match      = $routeMatch->getMatchedRouteName();
         $match      = strtolower($match);
         $route      = strtolower($route);
         if ($route == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 sprintf('Failed asserting route matched was NOT "%s"', $route)
-            );
+            ));
         }
         $this->assertNotEquals($route, $match);
     }
@@ -704,10 +728,10 @@ public function assertNoMatchedRoute()
         if ($routeMatch) {
             $match      = $routeMatch->getMatchedRouteName();
             $match      = strtolower($match);
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting that no route matched, actual matched route name is "%s"',
                 $match
-            ));
+            )));
         }
         $this->assertNull($routeMatch);
     }
diff --git a/src/PHPUnit/Controller/AbstractHttpControllerTestCase.php b/src/PHPUnit/Controller/AbstractHttpControllerTestCase.php
index 41c0565d63..e517557564 100644
--- a/src/PHPUnit/Controller/AbstractHttpControllerTestCase.php
+++ b/src/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -58,10 +58,10 @@ public function assertHasResponseHeader($header)
     {
         $responseHeader = $this->getResponseHeader($header);
         if (false === $responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header "%s" found',
                 $header
-            ));
+            )));
         }
         $this->assertNotEquals(false, $responseHeader);
     }
@@ -75,10 +75,10 @@ public function assertNotHasResponseHeader($header)
     {
         $responseHeader = $this->getResponseHeader($header);
         if (false !== $responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header "%s" WAS NOT found',
                 $header
-            ));
+            )));
         }
         $this->assertFalse($responseHeader);
     }
@@ -93,10 +93,10 @@ public function assertResponseHeaderContains($header, $match)
     {
         $responseHeader = $this->getResponseHeader($header);
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header, header "%s" doesn\'t exist',
                 $header
-            ));
+            )));
         }
 
         if (!$responseHeader instanceof \ArrayIterator) {
@@ -113,12 +113,12 @@ public function assertResponseHeaderContains($header, $match)
         }
 
         if (!$headerMatched) {
-            throw new \PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new \PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header "%s" exists and contains "%s", actual content is "%s"',
                 $header,
                 $match,
                 $currentHeader->getFieldValue()
-            ));
+            )));
         }
 
         $this->assertEquals($match, $currentHeader->getFieldValue());
@@ -134,10 +134,10 @@ public function assertNotResponseHeaderContains($header, $match)
     {
         $responseHeader = $this->getResponseHeader($header);
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header, header "%s" doesn\'t exist',
                 $header
-            ));
+            )));
         }
 
         if (!$responseHeader instanceof \ArrayIterator) {
@@ -146,11 +146,11 @@ public function assertNotResponseHeaderContains($header, $match)
 
         foreach ($responseHeader as $currentHeader) {
             if ($match == $currentHeader->getFieldValue()) {
-                throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+                throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                     'Failed asserting response header "%s" DOES NOT CONTAIN "%s"',
                     $header,
                     $match
-                ));
+                )));
             }
         }
 
@@ -167,10 +167,10 @@ public function assertResponseHeaderRegex($header, $pattern)
     {
         $responseHeader = $this->getResponseHeader($header);
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header, header "%s" doesn\'t exist',
                 $header
-            ));
+            )));
         }
 
         if (!$responseHeader instanceof \ArrayIterator) {
@@ -188,12 +188,12 @@ public function assertResponseHeaderRegex($header, $pattern)
         }
 
         if (!$headerMatched) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header "%s" exists and matches regex "%s", actual content is "%s"',
                 $header,
                 $pattern,
                 $currentHeader->getFieldValue()
-            ));
+            )));
         }
 
         $this->assertTrue($headerMatched);
@@ -209,10 +209,10 @@ public function assertNotResponseHeaderRegex($header, $pattern)
     {
         $responseHeader = $this->getResponseHeader($header);
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response header, header "%s" doesn\'t exist',
                 $header
-            ));
+            )));
         }
 
         if (!$responseHeader instanceof \ArrayIterator) {
@@ -225,11 +225,11 @@ public function assertNotResponseHeaderRegex($header, $pattern)
             $headerMatched = (bool) preg_match($pattern, $currentHeader->getFieldValue());
 
             if ($headerMatched) {
-                throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+                throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                     'Failed asserting response header "%s" DOES NOT MATCH regex "%s"',
                     $header,
                     $pattern
-                ));
+                )));
             }
         }
 
@@ -243,9 +243,9 @@ public function assertRedirect()
     {
         $responseHeader = $this->getResponseHeader('Location');
         if (false === $responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 'Failed asserting response is a redirect'
-            );
+            ));
         }
         $this->assertNotEquals(false, $responseHeader);
     }
@@ -257,10 +257,10 @@ public function assertNotRedirect()
     {
         $responseHeader = $this->getResponseHeader('Location');
         if (false !== $responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response is NOT a redirect, actual redirection is "%s"',
                 $responseHeader->getFieldValue()
-            ));
+            )));
         }
         $this->assertFalse($responseHeader);
     }
@@ -274,16 +274,16 @@ public function assertRedirectTo($url)
     {
         $responseHeader = $this->getResponseHeader('Location');
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 'Failed asserting response is a redirect'
-            );
+            ));
         }
         if ($url != $responseHeader->getFieldValue()) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response redirects to "%s", actual redirection is "%s"',
                 $url,
                 $responseHeader->getFieldValue()
-            ));
+            )));
         }
         $this->assertEquals($url, $responseHeader->getFieldValue());
     }
@@ -297,15 +297,15 @@ public function assertNotRedirectTo($url)
     {
         $responseHeader = $this->getResponseHeader('Location');
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 'Failed asserting response is a redirect'
-            );
+            ));
         }
         if ($url == $responseHeader->getFieldValue()) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response redirects to "%s"',
                 $url
-            ));
+            )));
         }
         $this->assertNotEquals($url, $responseHeader->getFieldValue());
     }
@@ -319,16 +319,16 @@ public function assertRedirectRegex($pattern)
     {
         $responseHeader = $this->getResponseHeader('Location');
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 'Failed asserting response is a redirect'
-            );
+            ));
         }
         if (!preg_match($pattern, $responseHeader->getFieldValue())) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response redirects to URL MATCHING "%s", actual redirection is "%s"',
                 $pattern,
                 $responseHeader->getFieldValue()
-            ));
+            )));
         }
         $this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));
     }
@@ -342,15 +342,15 @@ public function assertNotRedirectRegex($pattern)
     {
         $responseHeader = $this->getResponseHeader('Location');
         if (!$responseHeader) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(
                 'Failed asserting response is a redirect'
-            );
+            ));
         }
         if (preg_match($pattern, $responseHeader->getFieldValue())) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting response DOES NOT redirect to URL MATCHING "%s"',
                 $pattern
-            ));
+            )));
         }
         $this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));
     }
@@ -434,10 +434,10 @@ private function queryAssertion($path, $useXpath = false)
         $method = $useXpath ? 'xpathQueryCount' : 'queryCount';
         $match = $this->$method($path);
         if (!$match > 0) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s EXISTS',
                 $path
-            ));
+            )));
         }
         $this->assertTrue($match > 0);
     }
@@ -473,10 +473,10 @@ private function notQueryAssertion($path, $useXpath = false)
         $method = $useXpath ? 'xpathQueryCount' : 'queryCount';
         $match  = $this->$method($path);
         if ($match != 0) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s DOES NOT EXIST',
                 $path
-            ));
+            )));
         }
         $this->assertEquals(0, $match);
     }
@@ -513,12 +513,12 @@ private function queryCountAssertion($path, $count, $useXpath = false)
         $method = $useXpath ? 'xpathQueryCount' : 'queryCount';
         $match = $this->$method($path);
         if ($match != $count) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s OCCURS EXACTLY %d times, actually occurs %d times',
                 $path,
                 $count,
                 $match
-            ));
+            )));
         }
         $this->assertEquals($match, $count);
     }
@@ -557,11 +557,11 @@ private function notQueryCountAssertion($path, $count, $useXpath = false)
         $method = $useXpath ? 'xpathQueryCount' : 'queryCount';
         $match = $this->$method($path);
         if ($match == $count) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s DOES NOT OCCUR EXACTLY %d times',
                 $path,
                 $count
-            ));
+            )));
         }
         $this->assertNotEquals($match, $count);
     }
@@ -600,12 +600,12 @@ private function queryCountMinAssertion($path, $count, $useXpath = false)
         $method = $useXpath ? 'xpathQueryCount' : 'queryCount';
         $match = $this->$method($path);
         if ($match < $count) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s OCCURS AT LEAST %d times, actually occurs %d times',
                 $path,
                 $count,
                 $match
-            ));
+            )));
         }
         $this->assertTrue($match >= $count);
     }
@@ -644,12 +644,12 @@ private function queryCountMaxAssertion($path, $count, $useXpath = false)
         $method = $useXpath ? 'xpathQueryCount' : 'queryCount';
         $match = $this->$method($path);
         if ($match > $count) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s OCCURS AT MOST %d times, actually occurs %d times',
                 $path,
                 $count,
                 $match
-            ));
+            )));
         }
         $this->assertTrue($match <= $count);
     }
@@ -688,10 +688,10 @@ private function queryContentContainsAssertion($path, $match, $useXpath = false)
         $result = $this->query($path, $useXpath);
 
         if ($result->count() == 0) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s EXISTS',
                 $path
-            ));
+            )));
         }
 
         $nodeValues = [];
@@ -705,12 +705,12 @@ private function queryContentContainsAssertion($path, $match, $useXpath = false)
             $nodeValues[] = $node->nodeValue;
         }
 
-        throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+        throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
             'Failed asserting node denoted by %s CONTAINS content "%s", Contents: [%s]',
             $path,
             $match,
             implode(',', $nodeValues)
-        ));
+        )));
     }
 
     /**
@@ -746,18 +746,18 @@ private function notQueryContentContainsAssertion($path, $match, $useXpath = fal
     {
         $result = $this->query($path, $useXpath);
         if ($result->count() == 0) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s EXISTS',
                 $path
-            ));
+            )));
         }
         foreach ($result as $node) {
             if ($node->nodeValue == $match) {
-                throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+                throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                     'Failed asserting node DENOTED BY %s DOES NOT CONTAIN content "%s"',
                     $path,
                     $match
-                ));
+                )));
             }
         }
         $currentValue = $node->nodeValue;
@@ -797,18 +797,18 @@ private function queryContentRegexAssertion($path, $pattern, $useXpath = false)
     {
         $result = $this->query($path, $useXpath);
         if ($result->count() == 0) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s EXISTS',
                 $path
-            ));
+            )));
         }
         if (!preg_match($pattern, $result->current()->nodeValue)) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node denoted by %s CONTAINS content MATCHING "%s", actual content is "%s"',
                 $path,
                 $pattern,
                 $result->current()->nodeValue
-            ));
+            )));
         }
         $this->assertTrue((bool) preg_match($pattern, $result->current()->nodeValue));
     }
@@ -846,17 +846,17 @@ private function notQueryContentRegexAssertion($path, $pattern, $useXpath = fals
     {
         $result = $this->query($path, $useXpath);
         if ($result->count() == 0) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s EXISTS',
                 $path
-            ));
+            )));
         }
         if (preg_match($pattern, $result->current()->nodeValue)) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            throw new PHPUnit_Framework_ExpectationFailedException($this->createFailureMessage(sprintf(
                 'Failed asserting node DENOTED BY %s DOES NOT CONTAIN content MATCHING "%s"',
                 $path,
                 $pattern
-            ));
+            )));
         }
         $this->assertFalse((bool) preg_match($pattern, $result->current()->nodeValue));
     }
diff --git a/test/PHPUnit/Controller/AbstractControllerTestCaseTest.php b/test/PHPUnit/Controller/AbstractControllerTestCaseTest.php
index 05283d3e8c..2066dc1e6a 100644
--- a/test/PHPUnit/Controller/AbstractControllerTestCaseTest.php
+++ b/test/PHPUnit/Controller/AbstractControllerTestCaseTest.php
@@ -10,6 +10,8 @@
 
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamWrapper;
+use PHPUnit_Framework_ExpectationFailedException;
+use RuntimeException;
 use Zend\Console\Console;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
@@ -22,6 +24,9 @@
  */
 class AbstractControllerTestCaseTest extends AbstractHttpControllerTestCase
 {
+    protected $traceError = true;
+    protected $traceErrorCache = true;
+
     public function tearDownCacheDir()
     {
         vfsStreamWrapper::register();
@@ -43,6 +48,7 @@ public static function rmdir($dir)
 
     protected function setUp()
     {
+        $this->traceErrorCache = $this->traceError;
         $this->tearDownCacheDir();
         Console::overrideIsConsole(null);
         $this->setApplicationConfig(
@@ -53,6 +59,7 @@ protected function setUp()
 
     protected function tearDown()
     {
+        $this->traceError = $this->traceErrorCache;
         $this->tearDownCacheDir();
         parent::tearDown();
     }
@@ -139,6 +146,54 @@ public function testAssertModuleName()
         $this->assertModuleName('Application');
     }
 
+    public function testAssertExceptionDetailsPresentWhenTraceErrorIsEnabled()
+    {
+        $this->traceError = true;
+        $this->dispatch('/tests');
+        $this->getApplication()->getMvcEvent()->setParam(
+            'exception',
+            new RuntimeException('Expected exception message')
+        );
+
+        $caught = false;
+        try {
+            $this->assertModuleName('Application');
+        } catch (PHPUnit_Framework_ExpectationFailedException $ex) {
+            $caught = true;
+            $message = $ex->getMessage();
+        }
+
+        $this->assertTrue($caught, 'Did not catch expected exception!');
+
+        $this->assertContains('actual module name is "baz"', $message);
+        $this->assertContains("Exception 'RuntimeException' with message 'Expected exception message'", $message);
+        $this->assertContains(__FILE__, $message);
+    }
+
+    public function testAssertExceptionDetailsNotPresentWhenTraceErrorIsDisabled()
+    {
+        $this->traceError = false;
+        $this->dispatch('/tests');
+        $this->getApplication()->getMvcEvent()->setParam(
+            'exception',
+            new RuntimeException('Expected exception message')
+        );
+
+        $caught = false;
+        try {
+            $this->assertModuleName('Application');
+        } catch (PHPUnit_Framework_ExpectationFailedException $ex) {
+            $caught = true;
+            $message = $ex->getMessage();
+        }
+
+        $this->assertTrue($caught, 'Did not catch expected exception!');
+
+        $this->assertContains('actual module name is "baz"', $message);
+        $this->assertNotContains("Exception 'RuntimeException' with message 'Expected exception message'", $message);
+        $this->assertNotContains(__FILE__, $message);
+    }
+
     public function testAssertNotModuleName()
     {
         $this->dispatch('/tests');