diff --git a/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryAssemblerTest.java b/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryAssemblerTest.java
index b7e57cb..576b25f 100644
--- a/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryAssemblerTest.java
+++ b/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryAssemblerTest.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.Collections;
 
 public class DefaultRepositoryAssemblerTest
@@ -71,7 +72,7 @@
         ClassLoader cloader = Thread.currentThread().getContextClassLoader();
         URL res = cloader.getResource( "projects/" + projectResource );
 
-        File projectFile = new File( res.getPath() ).getAbsoluteFile();
+        File projectFile = new File( URLDecoder.decode( res.getPath(), "UTF-8" ) ).getAbsoluteFile();
 
         if ( preCacheParent )
         {
@@ -119,7 +120,7 @@
         ClassLoader cloader = Thread.currentThread().getContextClassLoader();
         URL res = cloader.getResource( "marker.txt" );
 
-        File markerFile = new File( res.getPath() );
+        File markerFile = new File( URLDecoder.decode( res.getPath(), "UTF-8" ) );
         markerFile = markerFile.getCanonicalFile();
 
         File repoDir = new File( markerFile.getParentFile(), "remote-repository" );
