diff --git a/build.gradle b/build.gradle
index 0479a2482..a1bc2058a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ task build (dependsOn: pack) {
 }
 
 task clean(type: Delete) {
-  delete buildDir
+    delete buildDir
 }
 
 task wrapper(type: Wrapper) {
diff --git a/jadx-samples/build.gradle b/jadx-samples/build.gradle
index 4379e24f3..cbc7dbb9c 100644
--- a/jadx-samples/build.gradle
+++ b/jadx-samples/build.gradle
@@ -1,6 +1,7 @@
 project.ext {
     mainSamplesClass = "jadx.samples.RunTests"  
     samplesJadxSrcDir = "${buildDir}/samples-jadx/src"
+    samplesJadxOutDir = "${buildDir}/samples-jadx/output"
 }
 
 dependencies {
@@ -8,16 +9,6 @@ dependencies {
     compile(project(":jadx-cli"))
 }
 
-sourceSets {
-    //TODO don't add to eclipse classpath
-    samplesJadx {
-        java {
-            srcDir samplesJadxSrcDir
-            output.classesDir "${buildDir}/samples-jadx/output"
-        }
-    }
-}
-
 compileJava {
     options.compilerArgs << '-g:none'
 }
@@ -32,19 +23,29 @@ task samplesJar(type: Jar, dependsOn: samplesRun) {
     from sourceSets.main.output
 }
 
-task samplesJadxCreate(type: JavaExec, dependsOn: [compileJava, samplesJar]) {  
+task samplesJadxCreate(type: JavaExec, dependsOn: samplesJar) {  
     classpath = sourceSets.main.output + configurations.compile
-    main = "jadx.cli.JadxCLI" 
+    main = project(":jadx-cli").mainClassName 
     args = ['-d', samplesJadxSrcDir, samplesJar.archivePath]
 }
 
-compileSamplesJadxJava.dependsOn samplesJadxCreate
+task samplesJadxCompile(type: JavaCompile, dependsOn: samplesJadxCreate) {  
+    classpath = configurations.compile
+    destinationDir = file samplesJadxOutDir
+    source = samplesJadxSrcDir
+}
 
-task samplesJadxRun(type: JavaExec, dependsOn: compileSamplesJadxJava) {  
-    classpath = sourceSets.samplesJadx.output
+task samplesJadxRun(type: JavaExec, dependsOn: samplesJadxCompile) {  
+    classpath = files samplesJadxOutDir
     main = mainSamplesClass  
 }
 
 task samples (dependsOn: samplesJadxRun) {
 }
 
+task cleanGeneratedFiles (type: Delete) {
+    delete samplesJadxSrcDir
+    delete samplesJadxOutDir
+}
+
+clean.dependsOn cleanGeneratedFiles