diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java
index f83eea21da..7f444b02df 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java
@@ -28,8 +28,10 @@
 import java.io.StringWriter;
 import java.net.MalformedURLException;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
@@ -459,12 +461,16 @@ public Collection<File> listFiles() {
      * @return an collection of java.io.File with the matching files
      */
     public Collection<File> listFiles( final String filters ) {
-        String wildcard = "*.jar";
-        if ( filters != null ) {
-            wildcard = "*" + filters + "*.jar";
+        final List<String> wildcards = new ArrayList<String>();
+        if ( filters == null ) {
+            wildcards.add( "*.jar" );
+            wildcards.add( "*.kjar" );
+        } else {
+            wildcards.add( "*" + filters + "*.jar" );
+            wildcards.add( "*" + filters + "*.kjar" );
         }
         Collection<File> files = FileUtils.listFiles( new File( M2_REPO_DIR ),
-                                                      new WildcardFileFilter( wildcard,
+                                                      new WildcardFileFilter( wildcards,
                                                                               IOCase.INSENSITIVE ),
                                                       DirectoryFileFilter.DIRECTORY );
 
diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java
index 0d9eede90b..2fda0b5350 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java
@@ -29,14 +29,12 @@
 import org.guvnor.m2repo.backend.server.helpers.FormData;
 import org.guvnor.m2repo.backend.server.helpers.HttpPostHelper;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.junit.Assert.*;
 
-@Ignore
 public class M2RepositoryTest {
 
     private static final Logger log = LoggerFactory.getLogger( M2RepositoryTest.class );
@@ -68,7 +66,6 @@ public static boolean deleteDir( File dir ) {
     }
 
     @Test
-    @Ignore("Fails - ignored for Beta3")
     public void testDeployArtifact() throws Exception {
         GuvnorM2Repository repo = new GuvnorM2Repository();
         repo.init();
@@ -90,7 +87,8 @@ public void testDeployArtifact() throws Exception {
             if ( fileName.startsWith( "guvnor-m2repo-editor-backend-0.0.1" ) && fileName.endsWith( ".jar" ) ) {
                 found = true;
                 String path = file.getPath();
-                String pom = GuvnorM2Repository.loadPOMFromJar( path );
+                String jarPath = path.substring( GuvnorM2Repository.M2_REPO_DIR.length() + 1 );
+                String pom = GuvnorM2Repository.loadPOMFromJar( jarPath );
                 assertNotNull( pom );
                 break;
             }