diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
index 6dd9784aaf1..c77b6fe680a 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
@@ -30,15 +30,8 @@ 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;
-import com.intellij.openapi.roots.ContentEntry;
-import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
 import com.intellij.openapi.startup.StartupManager;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.psi.FileViewProvider;
@@ -50,17 +43,13 @@ import com.intellij.testFramework.TestLogger;
 import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
 import com.intellij.testFramework.fixtures.*;
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
-import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
-import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode;
 import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -95,8 +84,8 @@ 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");
+        System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/../dependencies/androidSDK");
+        System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-21");
 
         super.setUp();
 
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
index e41290f2594..f1f85ddc7a4 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/KotlinAndroidTestCaseBase.java
@@ -180,7 +180,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase {
         AndroidSdkAdditionalData data = new AndroidSdkAdditionalData(sdk);
         AndroidSdkData sdkData = AndroidSdkData.getSdkData(sdkPath);
         assertNotNull(sdkData);
-        IAndroidTarget target = sdkData.findTargetByName("Android 4.2"); // TODO: Get rid of this hardcoded version number
+        IAndroidTarget target = sdkData.findTargetByName("Android 5.0"); // TODO: Get rid of this hardcoded version number
         if (target == null) {
             IAndroidTarget[] targets = sdkData.getTargets();
             for (IAndroidTarget t : targets) {
diff --git a/plugins/android-jps-plugin/android-jps-plugin.iml b/plugins/android-jps-plugin/android-jps-plugin.iml
index ec54f2f32e5..93ae21ada7b 100644
--- a/plugins/android-jps-plugin/android-jps-plugin.iml
+++ b/plugins/android-jps-plugin/android-jps-plugin.iml
@@ -17,5 +17,18 @@
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="idea-gradle-plugin">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/android-jps-plugin/testData/android/simple/simple.iml b/plugins/android-jps-plugin/testData/android/simple/simple.iml
index 6dfe1ad5ce8..1358b15fd0b 100644
--- a/plugins/android-jps-plugin/testData/android/simple/simple.iml
+++ b/plugins/android-jps-plugin/testData/android/simple/simple.iml
@@ -36,7 +36,7 @@
             <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
             <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
         </content>
-        <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
+        <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
         <orderEntry type="sourceFolder" forTests="false" />
         <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     </component>
diff --git a/plugins/android-jps-plugin/testData/android/simple/simple.ipr b/plugins/android-jps-plugin/testData/android/simple/simple.ipr
index 0c3ebcbc5ae..512ca70514c 100644
--- a/plugins/android-jps-plugin/testData/android/simple/simple.ipr
+++ b/plugins/android-jps-plugin/testData/android/simple/simple.ipr
@@ -11,7 +11,7 @@
         <module fileurl="file://$PROJECT_DIR$/simple.iml" filepath="$PROJECT_DIR$/simple.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 17 Platform" project-jdk-type="Android SDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 21 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
index e1b06bdaa45..825acf82325 100644
--- a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
+++ b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
@@ -28,7 +28,7 @@ import java.io.File
 
 public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() {
 
-    private val SDK_NAME = "Android API 17 Platform"
+    private val SDK_NAME = "Android API 21 Platform"
 
     override fun setUp() {
         super.setUp()
@@ -61,10 +61,10 @@ public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() {
     private fun addJdkAndAndroidSdk(): JpsSdk<JpsSimpleElement<JpsAndroidSdkProperties>> {
         val jdkName = "java_sdk"
         addJdk(jdkName)
-        val properties = JpsAndroidSdkProperties("android-17", jdkName)
-        val sdkPath = getHomePath() + "/androidSDK/"
+        val properties = JpsAndroidSdkProperties("android-21", jdkName)
+        val sdkPath = getHomePath() + "/../dependencies/androidSDK"
         val library = myModel!!.getGlobal().addSdk<JpsSimpleElement<JpsAndroidSdkProperties>>(SDK_NAME, sdkPath, "", JpsAndroidSdkType.INSTANCE, JpsSimpleElementImpl(properties))
-        library!!.addRoot(File(sdkPath + "/platforms/android-17/android.jar"), JpsOrderRootType.COMPILED)
+        library!!.addRoot(File(sdkPath + "/platforms/android-21/android.jar"), JpsOrderRootType.COMPILED)
         return library.getProperties()
     }
 }
diff --git a/update_dependencies.xml b/update_dependencies.xml
index c8d3023be77..b9f21c4fcc2 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -171,6 +171,9 @@
         <!-- Protocol Buffers -->
         <get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="2.5.0" bin="false"/>
 
+        <!-- Android SDK platform -->
+        <get_android_sdk version.full="21_r01" version.number="21" version.buildtools="21.1.1"/>
+
         <!-- CLI Parser -->
         <get-maven-library prefix="com/github/spullara/cli-parser" lib="cli-parser" version="1.1.1"/>
 
@@ -215,6 +218,63 @@
         </if>
     </target>
 
+    <macrodef name="get_android_sdk">
+        <attribute name="version.full"/>
+        <attribute name="version.number"/>
+        <attribute name="version.buildtools"/>
+        <sequential>
+            <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
+
+            <condition property="android.os.tag" value="windows">
+                <os family="windows"/>
+            </condition>
+
+            <condition property="android.os.tag" value="macosx">
+                <os family="mac"/>
+            </condition>
+
+            <condition property="android.os.tag" value="linux">
+                <and>
+                    <os family="unix"/>
+                    <not>
+                        <os family="mac"/>
+                    </not>
+                </and>
+            </condition>
+
+            <delete dir="dependencies/androidSDK" failonerror="false"/>
+            <get
+                src="https://dl-ssl.google.com/android/repository/android-@{version.full}.zip"
+                dest="dependencies/android_sdk.zip" usetimestamp="true"/>
+
+            <unzip src="dependencies/android_sdk.zip" dest="dependencies/androidSDK/platforms/android-@{version.number}/">
+                <cutdirsmapper dirs="1"/>
+            </unzip>
+
+            <get
+                src="https://dl-ssl.google.com/android/repository/build-tools_r@{version.buildtools}-${android.os.tag}.zip"
+                dest="dependencies/android_buildtools.zip" usetimestamp="true"/>
+
+            <unzip src="dependencies/android_buildtools.zip" dest="dependencies/androidSDK/build-tools/@{version.buildtools}/">
+                <cutdirsmapper dirs="1"/>
+            </unzip>
+
+            <if>
+                <equals arg1="${android.os.tag}" arg2="windows"/>
+                <then />
+                <else>
+                    <exec executable="chmod">
+                        <arg value="a+x"/>
+                        <arg path="dependencies/androidSDK/build-tools/@{version.buildtools}/aapt"/>
+                        <arg path="dependencies/androidSDK/build-tools/@{version.buildtools}/aidl"/>
+                        <arg path="dependencies/androidSDK/build-tools/@{version.buildtools}/dx"/>
+                        <arg path="dependencies/androidSDK/build-tools/@{version.buildtools}/zipalign"/>
+                    </exec>
+                </else>
+            </if>
+        </sequential>
+    </macrodef>
+
     <macrodef name="get-asm-sources-and-rename-packages">
         <attribute name="asm.version"/>
         <sequential>