diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
index cd38e879bc..f13dca4039 100644
--- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
+++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
@@ -46,7 +46,7 @@ class AccurestGradlePlugin implements Plugin<Project> {
 
 	void setConfigurationDefaults(AccurestConfigProperties extension) {
 		extension.with {
-			generatedTestSourcesDir = project.file("${project.buildDir}/generated-sources/accurest")
+			generatedTestSourcesDir = project.file("${project.buildDir}/generated-test-sources/accurest")
 			contractsDslDir = project.file("${project.rootDir}/src/test/resources/stubs") //TODO: Use sourceset
 			basePackageForTests = 'io.codearte.accurest.tests'
 		}
diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
index 7457760cf9..a8fd7cc7ef 100755
--- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
+++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
@@ -7,7 +7,7 @@ import spock.lang.Stepwise
 @Stepwise
 class BasicFunctionalSpec extends IntegrationSpec {
 
-	private static final String GENERATED_TEST = "build//generated-sources//accurest//accurest//twitter_places_analyzer//PairIdSpec.groovy"
+	private static final String GENERATED_TEST = "build//generated-test-sources//accurest//accurest//twitter_places_analyzer//PairIdSpec.groovy"
 	private static final String GENERATED_CLIENT_JSON_STUB = "build//production//bootSimple-stubs//repository//mappings//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.json"
 	private static final String GROOVY_DSL_CONTRACT = "repository//mappings//com//ofg//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.groovy"
 	private static final String TEST_EXECUTION_XML_REPORT = "build/test-results/TEST-accurest.twitter_places_analyzer.PairIdSpec.xml"
diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle
index f33b17b5a6..c4013e84a4 100644
--- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle
+++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle
@@ -46,7 +46,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService')
 		testMode = 'JaxRsClient'
 		baseClassForTests = 'com.blogspot.toomuchcoding.MvcSpec'
 		contractsDslDir = file("${project.projectDir.absolutePath}/mappings/")
-		generatedTestSourcesDir = file("${project.buildDir}/generated-sources/")
+		generatedTestSourcesDir = file("${project.buildDir}/generated-test-sources/")
 		stubsOutputDir = wireMockStubsOutputDir
 	}
 
diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle
index 25ca064fc4..418de70103 100644
--- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle
+++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle
@@ -46,7 +46,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService')
 		testMode = 'MockMvc'
 		baseClassForTests = 'com.blogspot.toomuchcoding.MvcSpec'
 		contractsDslDir = file("${project.projectDir.absolutePath}/mappings/")
-		generatedTestSourcesDir = file("${project.buildDir}/generated-sources/")
+		generatedTestSourcesDir = file("${project.buildDir}/generated-test-sources/")
 		stubsOutputDir = wireMockStubsOutputDir
 	}
 
diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle
index 25ca064fc4..418de70103 100644
--- a/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle
+++ b/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle
@@ -46,7 +46,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService')
 		testMode = 'MockMvc'
 		baseClassForTests = 'com.blogspot.toomuchcoding.MvcSpec'
 		contractsDslDir = file("${project.projectDir.absolutePath}/mappings/")
-		generatedTestSourcesDir = file("${project.buildDir}/generated-sources/")
+		generatedTestSourcesDir = file("${project.buildDir}/generated-test-sources/")
 		stubsOutputDir = wireMockStubsOutputDir
 	}