diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/InspectionProfileTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/InspectionProfileTest.java
index 8467309ef28d..b8ad3a04614d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/InspectionProfileTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/InspectionProfileTest.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInspection;
 
 import com.intellij.codeInsight.daemon.HighlightDisplayKey;
+import com.intellij.codeInspection.dataFlow.DataFlowInspection;
 import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection;
 import com.intellij.codeInspection.ex.*;
 import com.intellij.openapi.util.JDOMUtil;
@@ -254,7 +255,8 @@ public class InspectionProfileTest extends LightIdeaTestCase {
     assertEquals(0, countInitializedTools(profile));
     InspectionProfileEntry[] tools = profile.getInspectionTools(null);
     assertTrue(tools.length > 0);
-    InspectionProfileEntry tool = tools[0];
+    InspectionProfileEntry tool = profile.getInspectionTool(new DataFlowInspection().getShortName());
+    assertNotNull(tool);
     String id = tool.getShortName();
     System.out.println(id);
     if (profile.isToolEnabled(HighlightDisplayKey.findById(id))) {
@@ -269,7 +271,6 @@ public class InspectionProfileTest extends LightIdeaTestCase {
     if (initializedTools.size() != 1) {
       for (InspectionProfileEntry initializedTool : initializedTools) {
         System.out.println(initializedTool.getShortName());
-        ((InspectionToolWrapper)initializedTool).instantated.printStackTrace();
       }
       fail();
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java
index 32bc90a45ae9..112bf7a37135 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java
@@ -67,9 +67,6 @@ public abstract class InspectionToolWrapper<T extends InspectionProfileEntry, E
   public T getTool() {
     if (myTool == null) {
       //noinspection unchecked
-      if (ApplicationManager.getApplication().isUnitTestMode()) {
-        instantated = new Throwable();
-      }
       myTool = (T)myEP.instantiateTool();
       if (!myTool.getShortName().equals(myEP.getShortName())) {
         LOG.error("Short name not matched for " +
@@ -83,9 +80,6 @@ public abstract class InspectionToolWrapper<T extends InspectionProfileEntry, E
     return myTool;
   }
 
-  // todo remove it
-  public Throwable instantated;
-
   @Override
   public boolean isInitialized() {
     return myTool != null;