diff --git a/grails-resources/src/grails/templates/testing/Integration.groovy b/grails-resources/src/grails/templates/testing/Integration.groovy
index e699e21f2af..0eb6b7af28c 100644
--- a/grails-resources/src/grails/templates/testing/Integration.groovy
+++ b/grails-resources/src/grails/templates/testing/Integration.groovy
@@ -1,11 +1,6 @@
-@artifact.package@
+@artifact.package@import grails.test.spock.IntegrationSpec
 
-import spock.lang.*
-
-/**
- *
- */
-class @artifact.name@ extends Specification {
+class @artifact.name@ extends IntegrationSpec {
 
     def setup() {
     }
diff --git a/grails-scripts/src/main/scripts/CreateIntegrationTest.groovy b/grails-scripts/src/main/scripts/CreateIntegrationTest.groovy
index a47f1964448..919cde6fed3 100755
--- a/grails-scripts/src/main/scripts/CreateIntegrationTest.groovy
+++ b/grails-scripts/src/main/scripts/CreateIntegrationTest.groovy
@@ -32,7 +32,7 @@ target ('default': "Creates a new Grails integration test which loads the whole
 
     for (name in argsMap["params"]) {
         name = purgeRedundantArtifactSuffix(name, 'Spec')
-        createIntegrationTest(name: name, suffix: "", testType:"Integration")
+        createIntegrationTest(name: name, suffix: "Integration", testType:"Integration")
     }
 }