diff --git a/src/test/java/com/xebialabs/deployit/ci/FileSystemLocationTest.java b/src/test/java/com/xebialabs/deployit/ci/FileSystemLocationTest.java
index 3398af1..b188dbf 100644
--- a/src/test/java/com/xebialabs/deployit/ci/FileSystemLocationTest.java
+++ b/src/test/java/com/xebialabs/deployit/ci/FileSystemLocationTest.java
@@ -35,7 +35,6 @@
 
 import java.io.File;
 
-import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -43,7 +42,6 @@
 import static org.mockito.Mockito.when;
 
 public class FileSystemLocationTest {
-    private static final String FILE_SEPARATOR = File.separator;
 
     @Mock
     private JenkinsDeploymentListener listener;
@@ -63,7 +61,7 @@ public void setUp() {
     @Test
     public void shouldReturnPathWithoutChangesIfLocal() {
         FileSystemLocation fileSystemLocation = new FileSystemLocation("test.dar","./build/resources/test");
-        assertThat(fileSystemLocation.getDarFileLocation(localFilePath, listener, new EnvVars()), is(format("build%sresources%stest%stest.dar", FILE_SEPARATOR, FILE_SEPARATOR, FILE_SEPARATOR)));
+        assertThat(fileSystemLocation.getDarFileLocation(localFilePath, listener, new EnvVars()), is("build/resources/test/test.dar"));
     }
 
     @Test
@@ -84,7 +82,7 @@ public void shouldResolveEnvVarInPath() throws Exception {
         EnvVars envVars = new EnvVars();
         envVars.put("NAME","test");
         FileSystemLocation fileSystemLocation = new FileSystemLocation("$NAME.dar","./build/resources/test");
-        assertThat(fileSystemLocation.getDarFileLocation(localFilePath, listener, envVars), is(format("build%sresources%stest%stest.dar", FILE_SEPARATOR, FILE_SEPARATOR, FILE_SEPARATOR)));
+        assertThat(fileSystemLocation.getDarFileLocation(localFilePath, listener, envVars), is("build/resources/test/test.dar"));
 
     }
 }
diff --git a/src/test/java/com/xebialabs/deployit/ci/GeneratedLocationTest.java b/src/test/java/com/xebialabs/deployit/ci/GeneratedLocationTest.java
index d5801df..350c235 100644
--- a/src/test/java/com/xebialabs/deployit/ci/GeneratedLocationTest.java
+++ b/src/test/java/com/xebialabs/deployit/ci/GeneratedLocationTest.java
@@ -35,13 +35,11 @@
 import hudson.FilePath;
 import hudson.remoting.VirtualChannel;
 
-import static java.lang.String.format;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
 public class GeneratedLocationTest {
-    private static final String FILE_SEPARATOR = File.separator;
 
     @Mock
     private JenkinsDeploymentListener listener;
@@ -63,7 +61,7 @@ public void setUp() {
     @Test
     public void shouldReturnPathWithoutChangesIfLocal() {
         generatedLocation.setGeneratedLocation("/tmp/test-local/asd.dar");
-        assertThat(generatedLocation.getDarFileLocation(localFilePath, listener, new EnvVars()), is(format("%stmp%stest-local%sasd.dar", FILE_SEPARATOR, FILE_SEPARATOR, FILE_SEPARATOR)));
+        assertThat(generatedLocation.getDarFileLocation(localFilePath, listener, new EnvVars()), is("/tmp/test-local/asd.dar"));
     }
 
     @Test