diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java
index 28d48263fd2c..8c7f007aae20 100644
--- a/java/testFramework/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java
@@ -10,6 +10,7 @@ import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.Function;
@@ -20,7 +21,7 @@ import java.util.Arrays;
 /**
  * @author peter
  */
-public class InjectedLanguageFixtureTestCase extends JavaCodeInsightFixtureTestCase {
+public abstract class InjectedLanguageFixtureTestCase extends LightCodeInsightFixtureTestCase {
   protected void checkCompletionVariants(final FileType fileType, final String text, final String... strings) throws Throwable {
     myFixture.configureByText(fileType, text.replaceAll("\\|", "<caret>"));
     tuneCompletionFile(myFixture.getFile());
@@ -54,6 +55,7 @@ public class InjectedLanguageFixtureTestCase extends JavaCodeInsightFixtureTestC
       fail(Arrays.toString(elements));
     }
     myFixture.checkResult(resultText.replaceAll("\\|", "<caret>"));
+    FileDocumentManager.getInstance().saveDocument(myFixture.getDocument(myFixture.getFile()));
   }
 
   protected void tuneCompletionFile(PsiFile file) {
diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
index 0f6c725771af..194d7b1d95c1 100644
--- a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
@@ -4,28 +4,17 @@
  */
 package com.intellij.testFramework.fixtures;
 
-import com.intellij.codeInsight.lookup.Lookup;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupManager;
-import com.intellij.codeInsight.lookup.impl.LookupImpl;
 import com.intellij.openapi.application.PathManager;
-import com.intellij.openapi.application.Result;
-import com.intellij.openapi.command.WriteCommandAction;
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiElementFactory;
-import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
-import com.intellij.util.Function;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 
 import java.io.File;
-import java.util.Arrays;
 
 /**
  * @author peter
@@ -82,44 +71,6 @@ public abstract class JavaCodeInsightFixtureTestCase extends UsefulTestCase{
     return myFixture.getProject();
   }
 
-  protected void tuneCompletionFile(PsiFile file) {
-  }
-
-  protected void checkCompletionVariants(final FileType fileType, final String text, final String... strings) throws Throwable {
-    myFixture.configureByText(fileType, text.replaceAll("\\|", "<caret>"));
-    tuneCompletionFile(myFixture.getFile());
-    final LookupElement[] elements = myFixture.completeBasic();
-    assertNotNull(elements);
-    myFixture.checkResult(text.replaceAll("\\|", "<caret>"));
-
-    UsefulTestCase.assertSameElements(ContainerUtil.map(elements, new Function<LookupElement, String>() {
-      public String fun(final LookupElement lookupItem) {
-        return lookupItem.getLookupString();
-      }
-    }), strings);
-  }
-
-  protected void checkCompleted(final FileType fileType, final String text, final String resultText) throws Throwable {
-    myFixture.configureByText(fileType, text.replaceAll("\\|", "<caret>"));
-    tuneCompletionFile(myFixture.getFile());
-    final LookupElement[] elements = myFixture.completeBasic();
-    if (elements != null && elements.length == 1) {
-      new WriteCommandAction(getProject()) {
-        protected void run(Result result) throws Throwable {
-          ((LookupImpl)LookupManager.getInstance(getProject()).getActiveLookup()).finishLookup(Lookup.NORMAL_SELECT_CHAR);
-        }
-      }.execute();
-    }
-    else if (elements != null && elements.length > 0) {
-      fail(Arrays.toString(elements));
-    }
-    myFixture.checkResult(resultText.replaceAll("\\|", "<caret>"));
-  }
-
-  protected void assertNoVariants(final FileType fileType, final String text) throws Throwable {
-    checkCompleted(fileType, text, text);
-  }
-
   protected PsiManager getPsiManager() {
     return PsiManager.getInstance(getProject());
   }
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 114371c43cbe..729547f8f262 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -890,7 +890,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
     }
     final VirtualFile vFile;
     if (myTempDirFixture instanceof LightTempDirTestFixtureImpl) {
-      vFile = LightPlatformTestCase.getSourceRoot().createChildData(this, "aaa." + extension);
+      vFile = LightPlatformTestCase.getSourceRoot().findOrCreateChildData(this, "aaa." + extension);
     }
     else{
       final File tempFile = File.createTempFile("aaa", "." + extension, new File(getTempDirPath()));