diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
index 9d22a5aba29f..5b996725792d 100644
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
@@ -45,15 +45,19 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiPackage;
 import com.intellij.psi.impl.source.PostprocessReformattingAspect;
+import com.intellij.psi.search.ProjectScope;
 import com.intellij.testFramework.PsiTestCase;
 import com.intellij.testFramework.PsiTestData;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -681,4 +685,18 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
     event.setInjectedContext(true);
     action.actionPerformed(event);
   }
+
+  @NotNull
+  protected PsiClass findClass(@NotNull @NonNls final String name) {
+    final PsiClass aClass = myJavaFacade.findClass(name, ProjectScope.getProjectScope(getProject()));
+    assertNotNull("Class " + name + " not found", aClass);
+    return aClass;
+  }
+
+  @NotNull
+  protected PsiPackage findPackage(@NotNull @NonNls final String name) {
+    final PsiPackage aPackage = myJavaFacade.findPackage(name);
+    assertNotNull("Package " + name + " not found", aPackage);
+    return aPackage;
+  }
 }
diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
index b353177ed585..c5372661a182 100644
--- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.impl.JavaPsiFacadeEx;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -29,14 +28,28 @@ import java.util.Comparator;
 /**
  * @author mike
  */
-@NonNls public abstract class IdeaTestCase extends PlatformTestCase {
+public abstract class IdeaTestCase extends PlatformTestCase {
+  protected JavaPsiFacadeEx myJavaFacade;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    myJavaFacade = JavaPsiFacadeEx.getInstanceEx(myProject);
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    myJavaFacade = null;
+    super.tearDown();
+  }
+
   @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"})
   protected IdeaTestCase() {
     initPlatformPrefix();
   }
 
   public final JavaPsiFacadeEx getJavaFacade() {
-    return JavaPsiFacadeEx.getInstanceEx(myProject);
+    return myJavaFacade;
   }
 
   @Override
diff --git a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java
index 5a743e93fcde..9eb59e0a27c8 100644
--- a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java
@@ -32,7 +32,6 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.JavaPsiFacadeImpl;
 import com.intellij.psi.impl.PsiManagerImpl;
 import com.intellij.util.IncorrectOperationException;
 import org.jdom.Document;
@@ -49,8 +48,6 @@ import java.util.StringTokenizer;
  */
 public abstract class PsiTestCase extends ModuleTestCase {
   protected PsiManagerImpl myPsiManager;
-  protected JavaPsiFacadeImpl myJavaFacade;
-
   protected PsiFile myFile;
   protected PsiTestData myTestDataBefore;
   protected PsiTestData myTestDataAfter;
@@ -60,12 +57,10 @@ public abstract class PsiTestCase extends ModuleTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     myPsiManager = (PsiManagerImpl) PsiManager.getInstance(myProject);
-    myJavaFacade = (JavaPsiFacadeImpl) JavaPsiFacade.getInstance(myProject);
   }
 
   @Override
   protected void tearDown() throws Exception {
-    myJavaFacade = null;
     myPsiManager = null;
     myFile = null;
     myTestDataBefore = null;