diff --git a/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedSpec.groovy b/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy
similarity index 99%
rename from config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedSpec.groovy
rename to config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy
index 6f5f9673eb..4ad24b87fe 100644
--- a/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedSpec.groovy
+++ b/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy
@@ -23,7 +23,7 @@ import spock.lang.*
  *
  * @author Rob Winch
  */
-class XsdDocumentedSpec extends Specification {
+class XsdDocumentedTests extends Specification {
 
     def ignoredIds = ['nsa-any-user-service','nsa-any-user-service-parents','nsa-authentication','nsa-ldap','nsa-method-security','nsa-web']
     @Shared def appendix = new File('../docs/manual/src/docbook/appendix-namespace.xml')
diff --git a/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy
similarity index 96%
rename from samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy
rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy
index 3ba8d50aaa..ebc31c3899 100644
--- a/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy
+++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy
@@ -25,7 +25,7 @@ import geb.spock.*
  *
  * @author Rob Winch
  */
-class BaseSpec extends GebReportingSpec {
+class AbstractCasTests extends GebReportingSpec {
 
     /**
      * All relative urls will be interpreted against this. The host can change based upon a system property. This
diff --git a/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy
similarity index 98%
rename from samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy
rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy
index 0a304b9be6..059e0f16e7 100644
--- a/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy
+++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy
@@ -32,7 +32,7 @@ import spock.lang.*
  * @author Rob Winch
  */
 @Stepwise
-class CasSampleProxySpec extends BaseSpec {
+class CasSampleProxyTests extends AbstractCasTests {
     HttpClient client = new HttpClient()
     @Shared String casServerUrl = LoginPage.url.replaceFirst('/login','')
     @Shared JettyCasService service = new JettyCasService().init(casServerUrl)
diff --git a/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy
similarity index 98%
rename from samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy
rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy
index 0453565e7b..bc6bea1a84 100644
--- a/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy
+++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy
@@ -30,7 +30,7 @@ import spock.lang.Stepwise;
  * @author Rob Winch
  */
 @Stepwise
-class CasSampleSpec extends BaseSpec {
+class CasSampleTests extends AbstractCasTests {
     @Shared String casServerLogoutUrl = LoginPage.url.replaceFirst('/login','/logout')
 
     def 'access home page with unauthenticated user succeeds'() {