diff --git a/README.md b/README.md
index 2c7a064785..2338faf156 100644
--- a/README.md
+++ b/README.md
@@ -19,4 +19,18 @@ Sample usage
         </execution>
     </executions>
 </plugin>
-```
\ No newline at end of file
+```
+
+
+```
+
+Project default directories
+---
+
+Contract definitions (_contractsDir_):
+
+    /src/test/resources/contracts
+
+Generated accurest specifications (_generatedTestSourcesDir_):
+
+    /target/generated-test-sources/accurest
diff --git a/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java b/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java
index 3b26bf5617..670b68f619 100644
--- a/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java
+++ b/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java
@@ -24,7 +24,7 @@ public class GenerateSpecsMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${project.build.directory}", readonly = true)
 	private File projectBuildDirectory;
 
-	@Parameter(property = "contractsDir", defaultValue = "/src/test/resources/stubs")
+	@Parameter(property = "contractsDir", defaultValue = "/src/test/resources/contracts")
 	private String contractsDir;
 
 	@Parameter(property = "generatedTestSourcesDir", defaultValue = "/generated-test-sources/accurest")
diff --git a/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java b/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java
index bf32bcd1d4..608cb18d3b 100644
--- a/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java
+++ b/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java
@@ -22,12 +22,12 @@ public class GenerateStubsMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${project.build.directory}", readonly = true)
 	private File projectBuildDirectory;
 
+	@Parameter(property = "contractsDir", defaultValue = "/src/test/resources/contracts")
+	private String contractsDir;
+
 	@Parameter(property = "mappingsDir", defaultValue = "mappings")
 	private String mappingsDir;
 
-	@Parameter(property = "contractsDir", defaultValue = "/src/test/resources/stubs")
-	private String contractsDir;
-
 	public void execute() throws MojoExecutionException, MojoFailureException {
 		AccurestConfigProperties config = new AccurestConfigProperties();
 		config.setContractsDslDir(new File(baseDir, contractsDir));
diff --git a/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java b/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java
index ff4c7a9a69..71ed604edf 100644
--- a/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java
+++ b/src/test/java/io/codearte/accurest/maven/PluginUnitTest.java
@@ -25,6 +25,13 @@ public class PluginUnitTest {
 		assertFilesPresent(basedir, "target/mappings/Sample.json");
 	}
 
+	@Test
+	public void shouldGenerateWiremockFromStubsDirectory() throws Exception {
+		File basedir = resources.getBasedir("withStubs");
+		maven.executeMojo(basedir, "generateStubs", TestMavenRuntime.newParameter("contractsDir", "/src/test/resources/stubs"));
+		assertFilesPresent(basedir, "target/mappings/Sample.json");
+	}
+
 	@Test
 	public void shouldGenerateWiremockStubsInSelectedLocation() throws Exception {
 		File basedir = resources.getBasedir("basic");
@@ -32,13 +39,6 @@ public class PluginUnitTest {
 		assertFilesPresent(basedir, "target/foo/Sample.json");
 	}
 
-	@Test
-	public void shouldGenerateWiremockStubsInSelectedLocation2() throws Exception {
-		File basedir = resources.getBasedir("customContractsLocation");
-		maven.executeMojo(basedir, "generateStubs", TestMavenRuntime.newParameter("contractsDir", "src/foo"));
-		assertFilesPresent(basedir, "target/mappings/Sample.json");
-	}
-
 	@Test
 	public void shouldGenerateContractSpecificationInDefaultLocation() throws Exception {
 		File basedir = resources.getBasedir("basic");
diff --git a/src/test/projects/basic-with-execution/src/test/resources/stubs/Sample.groovy b/src/test/projects/basic-with-execution/src/test/resources/contracts/Sample.groovy
similarity index 100%
rename from src/test/projects/basic-with-execution/src/test/resources/stubs/Sample.groovy
rename to src/test/projects/basic-with-execution/src/test/resources/contracts/Sample.groovy
diff --git a/src/test/projects/basic/src/test/resources/stubs/Sample.groovy b/src/test/projects/basic/src/test/resources/contracts/Sample.groovy
similarity index 100%
rename from src/test/projects/basic/src/test/resources/stubs/Sample.groovy
rename to src/test/projects/basic/src/test/resources/contracts/Sample.groovy
diff --git a/src/test/projects/bootSimple/pom.xml b/src/test/projects/bootSimple/pom.xml
index 187d737361..0a5de4800d 100644
--- a/src/test/projects/bootSimple/pom.xml
+++ b/src/test/projects/bootSimple/pom.xml
@@ -100,6 +100,7 @@
 				</executions>
 				<configuration>
 					<baseClassForTests>com.ofg.twitter.place.BaseMockMvcSpec</baseClassForTests>
+					<stubs>/src/test/resources/stubs</stubs>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/src/test/projects/customContractsLocation/pom.xml b/src/test/projects/withStubs/pom.xml
similarity index 100%
rename from src/test/projects/customContractsLocation/pom.xml
rename to src/test/projects/withStubs/pom.xml
diff --git a/src/test/projects/customContractsLocation/src/foo/Sample.groovy b/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy
similarity index 100%
rename from src/test/projects/customContractsLocation/src/foo/Sample.groovy
rename to src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy