diff --git a/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java b/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
index 8846babdffba..28c9d5fd162f 100644
--- a/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
+++ b/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
@@ -71,7 +71,7 @@ public abstract class IdeaTestCase extends TestCase implements DataProvider {
   public static final long DEFAULT_TEST_TIME = 300L;
   public static long ourTestTime = DEFAULT_TEST_TIME;
   private static final MyThreadGroup MY_THREAD_GROUP = new MyThreadGroup();
-
+  private static boolean myRegisterExtensionPoints = false;
   protected long getTimeRequired() {
     return DEFAULT_TEST_TIME;
   }
@@ -93,7 +93,10 @@ public abstract class IdeaTestCase extends TestCase implements DataProvider {
       Extensions.registerAreaClass("IDEA_PROJECT", null);
       Extensions.registerAreaClass("IDEA_MODULE", "IDEA_PROJECT");
     }
-    Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());    
+    if (!myRegisterExtensionPoints){
+      Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());
+      myRegisterExtensionPoints = true;
+    }
   }
 
   protected void setUp() throws Exception {
diff --git a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java b/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
index b7beb897432f..6632780009a1 100644
--- a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
+++ b/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
@@ -60,6 +60,7 @@ public class LightIdeaTestCase extends TestCase implements DataProvider {
   private static TestCase ourTestCase = null;
   public static Thread ourTestThread;
   private String oldCodeStyleSettings;
+  private static boolean myRegisterExtensionPoints;
 
   /**
    * @return Project to be used in tests for example for project components retrieval.
@@ -92,7 +93,10 @@ public class LightIdeaTestCase extends TestCase implements DataProvider {
       Extensions.registerAreaClass("IDEA_PROJECT", null);
       Extensions.registerAreaClass("IDEA_MODULE", "IDEA_PROJECT");
     }
-    Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());
+    if (!myRegisterExtensionPoints){
+      Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());
+      myRegisterExtensionPoints = true;
+    }
     cleanupApplicationCaches();
   }