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 4b9ec6fe02..1e90009be0 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
@@ -54,6 +54,7 @@ class AccurestGradlePlugin implements Plugin<Project> {
 		task.description = "Generate server tests from GroovyDSL"
 		task.group = GROUP_NAME
 		task.conventionMapping.with {
+			contractsDslDir = { extension.contractsDslDir }
 			generatedTestSourcesDir = { extension.generatedTestSourcesDir }
 			configProperties = { extension }
 		}
diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy
index 37611c81b1..9cf7c64a2e 100644
--- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy
+++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy
@@ -3,13 +3,13 @@ package io.codearte.accurest.plugin
 import io.coderate.accurest.AccurestException
 import io.coderate.accurest.TestGenerator
 import io.coderate.accurest.config.AccurestConfigProperties
-import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
+import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 
-class GenerateServerTestsTask extends DefaultTask {
+class GenerateServerTestsTask extends ConventionTask {
 
 	@InputDirectory
 	File contractsDslDir
diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy
index 2ab2b704b4..b812c318c3 100644
--- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy
+++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy
@@ -2,12 +2,12 @@ package io.codearte.accurest.plugin
 
 import io.codearte.accurest.wiremock.DslToWiremockClientConverter
 import io.codearte.accurest.wiremock.RecursiveFilesConverter
-import org.gradle.api.DefaultTask
+import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.TaskAction
 
 //TODO: Implement as an incremental task: https://gradle.org/docs/current/userguide/custom_tasks.html#incremental_tasks ?
-class GenerateWiremockClientStubsFromDslTask extends DefaultTask {
+class GenerateWiremockClientStubsFromDslTask extends ConventionTask {
 
 	@InputDirectory
 	File contractsDslDir