diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
index cf1ec48ab9..7dabd60b18 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
@@ -7,7 +7,9 @@ import io.coderate.accurest.config.TestMode
 import io.coderate.accurest.util.NamesUtil
 
 import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
+import java.nio.file.StandardOpenOption
 
 import static ClassBuilder.createClass
 import static io.coderate.accurest.builder.MethodBuilder.createTestMethod
@@ -46,8 +48,9 @@ class TestGenerator {
 				if (containsStubs(it)) {
 					def testBaseDir = Paths.get(targetDirectory, NamesUtil.packageToDirectory(packageName))
 					Files.createDirectories(testBaseDir)
-					Files.write(Paths.get(testBaseDir.toString(), capitalize(it.name) + getTestClassExtension()),
-							buildClass(it, packageName).bytes)
+					def classPath = Paths.get(testBaseDir.toString(), capitalize(it.name) + getTestClassExtension()).toAbsolutePath()
+					def classBytes = buildClass(it, packageName).bytes
+					Files.write(classPath, classBytes, StandardOpenOption.CREATE)
 				}
 			}
 		}
diff --git a/accurest-core/src/main/resources/stubs/some.json b/accurest-core/src/main/resources/stubs/some.json
new file mode 100644
index 0000000000..e69de29bb2
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 63a5983e3a..0c198de1a5 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
@@ -24,7 +24,6 @@ class AccurestGradlePlugin implements Plugin<Project> {
 			project.logger.info("Accurest Plugin: Invoking test sources generation")
 
 			extension.stubsBaseDirectory = project.projectDir.path + File.separator + extension.stubsBaseDirectory
-			extension.generatedTestSourcesDir = buildGeneratedSourcesDir(project, extension)
 
 			project.sourceSets.test.groovy {
 				srcDir extension.generatedTestSourcesDir
@@ -43,7 +42,7 @@ class AccurestGradlePlugin implements Plugin<Project> {
 			if (hasIdea) {
 				project.idea {
 					module {
-						testSourceDirs += new File(buildGeneratedSourcesDir(project, extension))
+						testSourceDirs += new File(extension.generatedTestSourcesDir)
 					}
 				}
 			}
@@ -51,14 +50,5 @@ 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
-	}
 
 }