diff --git a/core/pom.xml b/core/pom.xml
index 18cc635b..f6cd8f23 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -320,7 +320,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>-Xmx1024m ${surefireArgLine}</argLine><!-- Last argument is required for code coverage to work. -->
+                    <!-- First argument increases the maximum heap size, second argument disables a nasty HotSpot optimization
+                         (see http://jawspeak.com/2010/05/26/hotspot-caused-exceptions-to-lose-their-stack-traces-in-production-and-the-fix/)
+                         and last argument is required for code coverage to work. -->
+                    <argLine>-Xmx1024m -XX:-OmitStackTraceInFastThrow ${surefireArgLine}</argLine>
                     <runOrder>alphabetical</runOrder>
                     <systemProperties>
                         <property>