diff --git a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverterSpec.groovy b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverterSpec.groovy
old mode 100644
new mode 100755
index f450449046..583de32c0b
--- a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverterSpec.groovy
+++ b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverterSpec.groovy
@@ -11,8 +11,7 @@ import java.nio.file.Paths
 
 class RecursiveFilesConverterSpec extends Specification {
 
-	private static
-	final Set<String> EXPECTED_TARGET_FILES = ["dslRoot.json", "dir1/dsl1.json", "dir1/dsl1b.json", "dir2/dsl2.json"]
+	private static final Set<Path> EXPECTED_TARGET_FILES = [Paths.get("dslRoot.json"), Paths.get("dir1/dsl1.json"), Paths.get("dir1/dsl1b.json"), Paths.get("dir2/dsl2.json")]
 
 	@Rule
 	public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -56,12 +55,11 @@ class RecursiveFilesConverterSpec extends Specification {
 			e.cause?.message == "Test conversion error"
 	}
 
-	private
-	static Set<String> getRelativePathsForFilesInDirectory(Collection<File> createdFiles, File targetRootDirectory) {
+	private static Set<Path> getRelativePathsForFilesInDirectory(Collection<File> createdFiles, File targetRootDirectory) {
 		Path rootSourcePath = Paths.get(targetRootDirectory.toURI())
-		Set<String> relativizedCreatedFiles = createdFiles.collect { File file ->
-			rootSourcePath.relativize(Paths.get(file.toURI())).toString()
+		Set<Path> relativizedCreatedFiles = createdFiles.collect { File file ->
+			rootSourcePath.relativize(Paths.get(file.toURI()))
 		}
-		relativizedCreatedFiles
+		return relativizedCreatedFiles
 	}
 }
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
old mode 100644
new mode 100755
index f8a7e25496..aad644fed1
--- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
@@ -56,7 +56,7 @@ class TestGenerator {
 		if (!includedDirectoryRelativePath.isEmpty()) {
 			List<File> filesToClass = directoryScanner.includedFiles.
 					grep { String includedFile ->
-						return includedFile.matches(includedDirectoryRelativePath + File.separator + "[A-Za-z0-9]*\\.groovy")
+						return normalizePath(includedFile).matches(normalizePath(includedDirectoryRelativePath + File.separator) + "[A-Za-z0-9]*\\.groovy")
 					}
 			.collect {
 				return new File(configProperties.contractsDslDir, it)
@@ -69,4 +69,8 @@ class TestGenerator {
 			}
 		}
 	}
+    
+    private String normalizePath(String path) {
+        return path.replaceAll(/\\+/, '/')
+    }
 }
\ No newline at end of file