diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
index eb677b16b5..24a69b1e09 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
@@ -6,7 +6,7 @@ package io.coderate.accurest.config
 class AccurestConfigProperties {
 	TestFramework targetFramework = TestFramework.SPOCK
 	TestMode testMode = TestMode.MOCKMVC
-	String stubsBaseDirectory = 'mappings'
+	String stubsBaseDirectory = 'stubs'
 	String basePackageForTests = 'io.codearte.accurest.tests'
 	String baseClassForTests
 	String ruleClassForTests
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 c27b13870d..d086084931 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
@@ -17,6 +17,8 @@ class AccurestGradlePlugin implements Plugin<Project> {
 	@Override
 	void apply(Project project) {
 		AccurestConfigProperties extension = project.extensions.create('accurest', AccurestConfigProperties)
+		extension.stubsBaseDirectory = project.projectDir.path + '/src/test/resources/' + extension.stubsBaseDirectory
+		extension.generatedTestSourcesDir = buildGeneratedSourcesDir(project, extension)
 
 		project.compileTestGroovy.dependsOn(TASK_NAME)
 
@@ -28,7 +30,6 @@ class AccurestGradlePlugin implements Plugin<Project> {
 			}
 
 			try {
-				extension.stubsBaseDirectory = project.projectDir.path + '/src/test/resources/' + extension.stubsBaseDirectory
 				TestGenerator generator = new TestGenerator(extension)
 				generator.generate()
 			} catch (IllegalStateException e) {
@@ -49,4 +50,14 @@ class AccurestGradlePlugin implements Plugin<Project> {
 
 	}
 
+	private String buildGeneratedSourcesDir(Project project, def extension) {
+		String moduleDir
+		if (project.getParent()) {
+			moduleDir = project.name + File.separator + extension.generatedTestSourcesDir
+		} else {
+			moduleDir = extension.generatedTestSourcesDir
+		}
+		moduleDir
+	}
+
 }