diff --git a/.gitignore b/.gitignore
index 438a12c..ffa901a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .gradle/
 .idea/
 build/
+out/
 local.properties
\ No newline at end of file
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 2e4bd65..b3e5c2f 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -34,8 +34,8 @@ jacocoTestReport {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compileOnly 'com.android.tools.build:gradle:3.0.0-beta4'
-    testCompile 'com.android.tools.build:gradle:3.0.0-beta4'
+    compileOnly 'com.android.tools.build:gradle:3.0.0-beta6'
+    testCompile 'com.android.tools.build:gradle:3.0.0-beta6'
     testCompile gradleTestKit()
     testCompile('org.spockframework:spock-core:1.1-groovy-2.4') {
         exclude module: 'groovy-all'
diff --git a/plugin/src/test/groovy/digital/wup/android_maven_publish/AbstractProjectBuilderSpec.groovy b/plugin/src/test/groovy/digital/wup/android_maven_publish/AbstractProjectBuilderSpec.groovy
index b8796cc..da9a58a 100644
--- a/plugin/src/test/groovy/digital/wup/android_maven_publish/AbstractProjectBuilderSpec.groovy
+++ b/plugin/src/test/groovy/digital/wup/android_maven_publish/AbstractProjectBuilderSpec.groovy
@@ -24,18 +24,20 @@ abstract class AbstractProjectBuilderSpec extends Specification {
     protected File root
 
     protected ProjectInternal project
+    private static int testFolderId = 0;
 
     def setup() {
-        root = new File('build/tmp/test')
+        root = new File("build/tmp/test-app${testFolderId++}")
+        root.mkdirs()
         cleanFolder(root)
         project = TestUtil.createRootProject(root)
     }
 
-    public static void cleanFolder(File folder) {
+    static void cleanFolder(File folder) {
         File[] files = folder.listFiles();
-        if(files!=null) { //some JVMs return null for empty dirs
-            for(File f: files) {
-                if(f.isDirectory()) {
+        if (files != null) { //some JVMs return null for empty dirs
+            for (File f : files) {
+                if (f.isDirectory()) {
                     cleanFolder(f);
                 } else {
                     f.delete();