diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
index a6455c69bbb4..340676caaaea 100644
--- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
@@ -26,6 +26,12 @@ import org.jetbrains.annotations.NonNls;
  * @author mike
  */
 @NonNls public abstract class IdeaTestCase extends PlatformTestCase {
+  private static boolean ourPlatformPrefixInitialized;
+
+  protected IdeaTestCase() {
+    initPlatformPrefix();
+  }
+
   public final JavaPsiFacadeEx getJavaFacade() {
     return JavaPsiFacadeEx.getInstanceEx(myProject);
   }
@@ -40,27 +46,19 @@ import org.jetbrains.annotations.NonNls;
     return StdModuleTypes.JAVA;
   }
 
-  //private void cleanTheWorld() throws IllegalAccessException, NoSuchFieldException {
-  //  try {
-  //    ((JobSchedulerImpl)JobScheduler.getInstance()).waitForCompletion();
-  //  }
-  //  catch (Throwable throwable) {
-  //    LOG.error(throwable);
-  //  }
-  //  UIUtil.dispatchAllInvocationEvents();
-  //
-  //  Thread thread = Thread.currentThread();
-  //  Field locals = Thread.class.getDeclaredField("threadLocals");
-  //  locals.setAccessible(true);
-  //  locals.set(thread, null);
-  //
-  //  String path = HeapWalker.findObjectUnder(ourApplication, Project.class);
-  //  if (path != null) {
-  //    throw new RuntimeException(getName() + " " + path);
-  //  }
-  //}
-
-  static {
-    System.setProperty("jbdt.test.fixture", "com.intellij.designer.dt.IJTestFixture");
+  public static void initPlatformPrefix() {
+    if (!ourPlatformPrefixInitialized) {
+      ourPlatformPrefixInitialized = true;
+      boolean isUltimate = true;
+      try {
+        IdeaTestCase.class.getClassLoader().loadClass("com.intellij.idea.IdeaUltimateApplication");
+      }
+      catch (ClassNotFoundException e) {
+        isUltimate = false;
+      }
+      if (!isUltimate) {
+        System.setProperty("idea.platform.prefix", "Idea");
+      }
+    }
   }
 }
diff --git a/java/testFramework/testFramework-java.iml b/java/testFramework/testFramework-java.iml
index 5e101414c506..b692257cf630 100644
--- a/java/testFramework/testFramework-java.iml
+++ b/java/testFramework/testFramework-java.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="lang-impl" exported="" />
     <orderEntry type="module" module-name="compiler-impl" />
     <orderEntry type="module" module-name="java-impl" />
+    <orderEntry type="module" module-name="execution-impl" exported="" scope="RUNTIME" />
   </component>
   <component name="copyright">
     <Base>