diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index e0a0ae70f4de..5a2b0f0ec244 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -96,6 +96,9 @@
     <psi.referenceContributor implementation="org.jetbrains.idea.devkit.references.IconsReferencesContributor"/>
     <referencesSearch implementation="org.jetbrains.idea.devkit.references.IconsReferencesContributor"/>
     <unusedDeclarationFixProvider implementation="org.jetbrains.idea.devkit.inspections.quickfix.RegisterExtensionFixProvider"/>
+
+    <stacktrace.fold substring="at com.intellij.testFramework."/>
+    
   </extensions>
 
   <module-components>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 57ae4c1beca4..ca66e772922e 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -983,16 +983,14 @@
     <langCodeStyleSettingsProvider implementation="com.intellij.ide.JavaLanguageCodeStyleSettingsProvider"/>
 
 
-    <stacktrace.fold substring="at java.awt.EventDispatchThread.pumpEventsForFilter("/>
-    <stacktrace.fold substring="at java.awt.EventDispatchThread.pumpEventsForHierarchy("/>
-    <stacktrace.fold substring="at java.awt.EventDispatchThread.pumpEvents("/>
+    <stacktrace.fold substring="at java.awt.EventDispatchThread"/>
     <stacktrace.fold substring="at java.awt.Window.dispatchEventImpl("/>
     <stacktrace.fold substring="at java.awt.Container.dispatchEventImpl("/>
     <stacktrace.fold substring="at java.awt.LightweightDispatcher."/>
     <stacktrace.fold substring="at java.awt.Component.dispatchEvent("/>
-    <stacktrace.fold substring="at java.awt.EventQueue.dispatchEvent("/>
+    <stacktrace.fold substring="at java.awt.event.InvocationEvent.dispatch("/>
+    <stacktrace.fold substring="at java.awt.EventQueue"/>
     <stacktrace.fold substring="at java.awt.Component.dispatchEventImpl("/>
-    <stacktrace.fold substring="at java.awt.EventDispatchThread.pumpOneEventForFilters("/>
     <stacktrace.fold substring="at java.awt.Container.processEvent("/>
     <stacktrace.fold substring="at javax.swing.JComponent.processMouseEvent("/>
     <stacktrace.fold substring="at javax.swing.plaf.basic.BasicMenuItemUI"/>
@@ -1004,12 +1002,10 @@
     <stacktrace.fold substring="at javax.swing.DefaultButtonModel.setPressed("/>
     <stacktrace.fold substring="at javax.swing.AbstractButton.fireActionPerformed("/>
     <stacktrace.fold substring="at javax.swing.AbstractButton$Handler.actionPerformed("/>
-    <stacktrace.fold substring="at java.awt.EventQueue$1.run("/>
     <stacktrace.fold substring="at java.security.AccessControlContext$1.doIntersectionPrivilege("/>
     <stacktrace.fold substring="at java.awt.EventQueue.dispatchEventImpl("/>
     <stacktrace.fold substring="at java.security.AccessController.doPrivileged(Native Method)"/>
-    <stacktrace.fold substring="at java.awt.EventQueue$2.run("/>
-    <stacktrace.fold substring="at java.awt.EventQueue.access$000("/>
+    <stacktrace.fold substring="at java.security.ProtectionDomain$1.doIntersectionPrivilege("/>
     <stacktrace.fold substring="at com.jgoodies.binding.beans.ExtendedPropertyChangeSupport.firePropertyChange0("/>
     <stacktrace.fold substring="at javax.swing.plaf.basic.BasicComboPopup$Handler.mouseReleased("/>