diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index 2cb3c6a..e81142b 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -25,7 +25,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
+        classpath 'com.android.tools.build:gradle:0.6.+'
     }
 }
 
diff --git a/templates/create/_MODULE_/tests/AndroidManifest.xml b/templates/create/_MODULE_/tests/AndroidManifest.xml.ftl
similarity index 100%
rename from templates/create/_MODULE_/tests/AndroidManifest.xml
rename to templates/create/_MODULE_/tests/AndroidManifest.xml.ftl
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 2352fa9..15ce49d 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -36,6 +36,8 @@
     <#else>
         <#assign compile_sdk = sample.compileSdkVersion/>
     </#if>
+<#elseif (sample.compileSdkVersion)?has_content>
+    <#assign compile_sdk = sample.compileSdkVersion/>
 <#else>
     <#assign compile_sdk = 18/>
 </#if>