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 aad644fed1..45ba0ff497 100755
--- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
@@ -1,13 +1,12 @@
 package io.coderate.accurest
-
 import groovy.transform.PackageScope
 import io.coderate.accurest.config.AccurestConfigProperties
+import org.apache.commons.io.FilenameUtils
 import org.codehaus.plexus.util.DirectoryScanner
 
 import java.util.concurrent.atomic.AtomicInteger
 
 import static io.coderate.accurest.util.NamesUtil.afterLast
-
 /**
  * @author Jakub Kubrynski
  */
@@ -71,6 +70,6 @@ class TestGenerator {
 	}
     
     private String normalizePath(String path) {
-        return path.replaceAll(/\\+/, '/')
+        return FilenameUtils.separatorsToUnix(path)
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d488248174..3a76dfeea2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,6 +51,7 @@ project(':accurest-core') {
 	dependencies {
 		compile 'org.slf4j:slf4j-api:[1.6.0,)'
 		compile 'org.codehaus.plexus:plexus-utils:3.0.21'
+		compile 'commons-io:commons-io:2.4'
 		testCompile 'cglib:cglib-nodep:2.2'
 		testCompile 'org.objenesis:objenesis:2.1'
 	}