diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
index 2bdf3e7d97..217022bd53 100644
--- a/maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
+++ b/maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
@@ -84,9 +84,10 @@
 					</execution>
 				</executions>
 				<configuration>
-					<baseClassForTests>com.ofg.twitter.place.BaseMockMvcSpec</baseClassForTests>
+					<baseClassForTests>com.ofg.twitter.place.BaseMockMvcTest</baseClassForTests>
 					<contractsDir>/src/test/resources/stubs</contractsDir>
 					<testFramework>SPOCK</testFramework>
+					<nameSuffixForTests>Test</nameSuffixForTests>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -119,7 +120,7 @@
 					</testSources>
 				</configuration>
 			</plugin>
-			<plugin>
+<!--			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.19</version>
 				<configuration>
@@ -127,7 +128,7 @@
 						<include>**/*Spec.java</include>
 					</includes>
 				</configuration>
-			</plugin>
+			</plugin>-->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.6</version>
diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceSpec.groovy b/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy
similarity index 94%
rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceSpec.groovy
rename to maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy
index 3c244ce6cd..d132261ded 100644
--- a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceSpec.groovy
+++ b/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/AcceptanceTest.groovy
@@ -9,7 +9,7 @@ import spock.lang.Specification
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
-class AcceptanceSpec extends Specification {
+class AcceptanceTest extends Specification {
 
 	def "should have controller up and running"() {
 		given:
diff --git a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcSpec.groovy b/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy
similarity index 86%
rename from maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcSpec.groovy
rename to maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy
index b85a44721d..96bf1e60c4 100644
--- a/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcSpec.groovy
+++ b/maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/com/ofg/twitter/place/BaseMockMvcTest.groovy
@@ -4,7 +4,7 @@ import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc
 import com.ofg.twitter.place.PairIdController
 import spock.lang.Specification
 
-abstract class BaseMockMvcSpec extends Specification {
+abstract class BaseMockMvcTest extends Specification {
 
 	def setup() {
 		RestAssuredMockMvc.standaloneSetup(new PairIdController())