diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
index 15bb4e44d79..c5a3e163a60 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
@@ -56,11 +56,12 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
     private fun completionType() = CompletionType.BASIC
 
     fun doTest(testPath: String?) {
-        myFixture!!.copyDirectoryToProject(getResDir()!!, "res")
-        myFixture!!.configureByFile(testPath!! + getTestName(true) + ".kt");
+        myFixture.copyDirectoryToProject(getResDir()!!, "res")
+        val virtualFile = myFixture.copyFileToProject(testPath + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+        myFixture.configureFromExistingVirtualFile(virtualFile)
         val fileText = FileUtil.loadFile(File(testPath + getTestName(true) + ".kt"), true)
         testCompletion(fileText, TargetPlatform.JVM, {
-            count -> myFixture!!.complete(completionType())
+            count -> myFixture.complete(completionType())
         })
     }
 
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt
index db0d60e53ab..a54da3b103d 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt
@@ -28,7 +28,8 @@ public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() {
     public fun doTest(path: String) {
         val f = myFixture!!
         f.copyDirectoryToProject(getResDir()!!, "res")
-        f.configureByFile(path + getTestName(true) + ".kt")
+        val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+        f.configureFromExistingVirtualFile(virtualFile)
 
         val targetElement = TargetElementUtilBase.findTargetElement(f.getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED or TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED)
         val propUsages = f.findUsages(targetElement!!)
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
index 1d0ba9dbba6..82c1a21acca 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
@@ -33,7 +33,8 @@ public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
     public fun doTest(path: String) {
         val f = myFixture!!
         f.copyDirectoryToProject(getResDir()!!, "res")
-        f.configureByFile(path + getTestName(true) + ".kt");
+        val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+        f.configureFromExistingVirtualFile(virtualFile)
 
         val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset())
         if (f.getElementAtCaret() !is JetProperty) fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}")
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
index 9f0bf443445..7d3deb159c7 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
@@ -35,7 +35,8 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
     public fun doTest(path: String) {
         val f = myFixture!!
         f.copyDirectoryToProject(getResDir()!!, "res")
-        f.configureByFile(path + getTestName(true) + ".kt")
+        val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+        f.configureFromExistingVirtualFile(virtualFile)
         val editor = f.getEditor()
         val file = f.getFile()
         val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file)