diff --git a/idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt b/idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
index 63b3815aeb8..62112cae999 100644
--- a/idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
+++ b/idea/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
@@ -38,16 +38,10 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
     private var kotlinInternalModeOriginalValue: Boolean = false
 
     override fun setUp() {
-        System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/androidSDK/")
-        System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-17")
         super.setUp()
         setAutoCompleteSetting(false)
     }
 
-    override fun createManifest() {
-        myFixture!!.copyFileToProject("idea/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML)
-    }
-
     private fun setAutoCompleteSetting(value: Boolean): Boolean {
         val settings = CodeInsightSettings.getInstance()
         val oldValue: Boolean
@@ -78,6 +72,4 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
         return PluginTestCaseBase.getTestDataPathBase() + "/android/completion/" + getTestName(true) + "/"
     }
 
-    override fun requireRecentSdk() = true
-
 }
diff --git a/idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt b/idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
index 350a33727b3..740494c9978 100644
--- a/idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
+++ b/idea/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
@@ -26,29 +26,17 @@ import org.jetbrains.jet.lang.psi.JetProperty
 
 public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
 
-    override fun setUp() {
-        System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/androidSDK/")
-        System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-17")
-        super.setUp()
-    }
-
     override fun getTestDataPath(): String {
         return PluginTestCaseBase.getTestDataPathBase() + "/android/goto/" + getTestName(true) + "/"
     }
 
-    override fun createManifest() {
-        myFixture!!.copyFileToProject("idea/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML)
-    }
-
-    override fun requireRecentSdk() = true
-
     public fun doTest(path: String) {
         val f = myFixture!!
         f.copyDirectoryToProject(getResDir()!!, "res")
         f.configureByFile(path + getTestName(true) + ".kt");
 
         val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset())
-        if (f.getElementAtCaret() !is JetProperty) fail("resolved element must be a property, not a ${f.getElementAtCaret().javaClass}")
+        if (f.getElementAtCaret() !is JetProperty) fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}")
         assertEquals("\"@+id/${(f.getElementAtCaret() as JetProperty).getName()}\"", resolved?.getText())
 
     }
diff --git a/idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt b/idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
index beaa0ae5c57..b24a32eb1b2 100644
--- a/idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
+++ b/idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
@@ -52,11 +52,6 @@ public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
 
         assertEquals(cliResult, ideResult)
     }
-    override fun setUp() {
-        System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/androidSDK/")
-        System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-17")
-        super.setUp()
-    }
 
     private fun getEnvironment(testPath: String): JetCoreEnvironment {
         val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
@@ -68,10 +63,4 @@ public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
     override fun getTestDataPath(): String? {
         return PluginTestCaseBase.getTestDataPathBase() + "/android/crossParser/" + getTestName(true) + "/"
     }
-
-    override fun createManifest() {
-        myFixture!!.copyFileToProject("idea/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML)
-    }
-
-    override fun requireRecentSdk() = true
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java b/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
index f1f5f661f49..14f2458c462 100644
--- a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
+++ b/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
@@ -28,6 +28,7 @@ import com.intellij.facet.FacetManager;
 import com.intellij.facet.ModifiableFacetModel;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.projectRoots.Sdk;
@@ -93,6 +94,10 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
 
     @Override
     protected void setUp() throws Exception {
+        // sdk path workaround, set real android sdk path and platform for android plugin to work
+        System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/androidSDK/");
+        System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-17");
+
         super.setUp();
 
         // this will throw an exception if we don't have a full Android SDK, so we need to do this first thing before any other setup
@@ -204,7 +209,8 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
     }
 
     protected void createManifest() throws IOException {
-        myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, SdkConstants.FN_ANDROID_MANIFEST_XML);
+        myFixture.copyFileToProject("idea/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML);
+     //   myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, SdkConstants.FN_ANDROID_MANIFEST_XML);
     }
 
     protected void createProjectProperties() throws IOException {
diff --git a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java b/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
index 0f610749b78..820062484a9 100644
--- a/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
+++ b/idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
@@ -137,7 +137,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase {
 
     /** Is the bundled (incomplete) SDK install adequate or do we need to find a valid install? */
     protected boolean requireRecentSdk() {
-        return false;
+        return true;
     }
 
     protected void addAndroidSdk(Module module, String sdkPath, String platformDir) {