diff --git a/spring-cloud-contract-verifier/build.gradle b/spring-cloud-contract-verifier/build.gradle
index 7872495400..b83dd96ee3 100644
--- a/spring-cloud-contract-verifier/build.gradle
+++ b/spring-cloud-contract-verifier/build.gradle
@@ -87,16 +87,8 @@ project(":$verifier-root:$verifier-gradle-plugin") {
 	}
 
 	test {
-		exclude '**/*FunctionalSpec.*'
 		systemProperties = testSystemProperties
 	}
-	task funcTest(type: Test) {
-		include '**/*FunctionalSpec.*'
-		systemProperties = testSystemProperties
-		reports.html {
-			destination = file("${reporting.baseDir}/funcTests")
-		}
-	}
 
 	task archiveMessagingLibsDependencies(type: Sync) {
 		from configurations.messagingLibs.resolvedConfiguration.resolvedArtifacts.collect { it.file }
@@ -113,7 +105,5 @@ project(":$verifier-root:$verifier-gradle-plugin") {
 	archiveContractVerifierGradlePluginLibsDependencies.dependsOn project(":$verifier-root:$verifier-gradle-plugin").tasks.jar
 
 	test.dependsOn archiveMessagingLibsDependencies, archiveContractVerifierGradlePluginLibsDependencies
-	funcTest.dependsOn archiveMessagingLibsDependencies, archiveContractVerifierGradlePluginLibsDependencies
 
-	uploadArchives.dependsOn { funcTest }
 }
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
index 1acee5de97..3e1383337b 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
@@ -12,9 +12,7 @@ group = 'org.springframework.cloud.testprojects'
 
 ext {
 	contractsDir = file("repository/mappings")
-	stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/")
-	wireMockStubsOutputDir = file(new File(stubsOutputDirRoot, 'repository/mappings/'))
-	contractsOutputDir = file(new File(stubsOutputDirRoot, 'repository/contracts/'))
+	stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/repository/")
 }
 
 configurations {
@@ -54,29 +52,17 @@ contractVerifier {
 	basePackageForTests = 'contracts'
 	contractsDslDir = contractsDir
 //	generatedTestSourcesDir = file("${project.rootDir}/src/test/groovy/")
-	stubsOutputDir = wireMockStubsOutputDir
+	stubsOutputDir = stubsOutputDirRoot
 	targetFramework = 'Spock'
 }
 
-//TODO: Put it into the plugin
-task createWireMockStubsOutputDir << {
-	wireMockStubsOutputDir.mkdirs()
-}
-
-generateWireMockClientStubs.dependsOn { createWireMockStubsOutputDir }
 generateContractTests.dependsOn generateWireMockClientStubs
 
 wrapper {
 	gradleVersion '2.2.1'
 }
 
-task copyContracts(type: Copy) {
-	from contractsDir
-	include '**/*.groovy'
-	into contractsOutputDir
-}
-
-task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs", copyContracts]) {
+task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs"]) {
 	baseName = "${project.name}"
 	classifier = "stubs"
 	from stubsOutputDirRoot