diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
index 2042f25461..e13a2ea523 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
@@ -51,7 +51,8 @@ class TestGenerator {
 				if (containsStubs(it)) {
 					def testBaseDir = Paths.get(targetDirectory, NamesUtil.packageToDirectory(packageName))
 					Files.createDirectories(testBaseDir)
-					def classPath = Paths.get(testBaseDir.toString(), capitalize(it.name) + getTestClassExtension()).toAbsolutePath()
+					def classPath = Paths.get(testBaseDir.toString(), capitalize(it.name) + getTestClassSuffix() + getTestClassExtension())
+							.toAbsolutePath()
 					def classBytes = buildClass(it, packageName).bytes
 					Files.write(classPath, classBytes, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)
 					counter.incrementAndGet()
@@ -60,6 +61,10 @@ class TestGenerator {
 		}
 	}
 
+	private String getTestClassSuffix() {
+		return configProperties.targetFramework == TestFramework.SPOCK ? 'Spec' : 'Test'
+	}
+
 	private String getTestClassExtension() {
 		return configProperties.targetFramework == TestFramework.SPOCK ? '.groovy' : '.java'
 	}