### Eclipse Workspace Patch 1.0
#P jaas
Index: modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java
===================================================================
--- modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java	(revision 1540254)
+++ modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java	(working copy)
@@ -254,9 +254,9 @@
     @Test
     public void testNonExistantPropertiesFile() throws LoginException, IOException, UnsupportedCallbackException {
         try {
-            testWithUsersFile("/test/users.properties");
+            testWithUsersFile(File.separator + "test" + File.separator + "users.properties");
         } catch (LoginException e) {
-            Assert.assertEquals("Users file not found at /test/users.properties", e.getMessage());
+            Assert.assertEquals("Users file not found at " + File.separator + "test" + File.separator + "users.properties", e.getMessage());
         }
     }
 
### Eclipse Workspace Patch 1.0
#P org.apache.karaf.main
Index: src/test/java/org/apache/karaf/main/MainStartTest.java
===================================================================
--- src/test/java/org/apache/karaf/main/MainStartTest.java	(revision 1540254)
+++ src/test/java/org/apache/karaf/main/MainStartTest.java	(working copy)
@@ -22,7 +22,6 @@
 
 import junit.framework.Assert;
 
-import org.apache.karaf.main.util.Utils;
 import org.junit.After;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -43,10 +42,9 @@
     public void testAutoStart() throws Exception {
         File basedir = new File(getClass().getClassLoader().getResource("foo").getPath()).getParentFile();
         File home = new File(basedir, "test-karaf-home");
-        File data = new File(home, "data");
-
-        Utils.deleteDirectory(data);
-
+        //Generate a unique folder name so that it does not conflict with data folders of other UTs. See KARAF-2558
+        File data = new File(home, "data" + System.currentTimeMillis());
+               
 		String[] args = new String[0];
 		System.setProperty("karaf.home", home.toString());
 		System.setProperty("karaf.data", data.toString());