diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
index f33351f087..b1095d3300 100755
--- a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
@@ -168,7 +168,7 @@ public class ImapServiceImplTest extends TestCase
          * "___-___folder_a_a" contains: "____-____file_a_a"
          * 
          */
-        importInternal("imapservice_test_folder_a.acp", testImapFolderNodeRef);
+        importInternal("imap/imapservice_test_folder_a.acp", testImapFolderNodeRef);
 
         reauthenticate(anotherUserName, anotherUserName);
     }
diff --git a/source/java/org/alfresco/repo/imap/LoadTester.java b/source/java/org/alfresco/repo/imap/LoadTester.java
index 77538dae86..838da8ed87 100755
--- a/source/java/org/alfresco/repo/imap/LoadTester.java
+++ b/source/java/org/alfresco/repo/imap/LoadTester.java
@@ -6,9 +6,10 @@ import java.util.List;
 
 import javax.mail.Flags;
 
+import junit.framework.TestCase;
+
 import org.alfresco.repo.importer.ACPImportPackageHandler;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -23,11 +24,8 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
-import com.icegreen.greenmail.imap.ImapConstants;
 import com.icegreen.greenmail.store.SimpleStoredMessage;
 
-import junit.framework.TestCase;
-
 public class LoadTester extends TestCase
 {
     private Log logger = LogFactory.getLog(LoadTester.class);
@@ -39,6 +37,7 @@ public class LoadTester extends TestCase
     private ImporterService importerService;
     
     private AlfrescoImapUser user;
+    // DH: Do not assume the presence of any specific user or password.  Create a new user for the test.
     private static final String USER_NAME = "admin";
     private static final String USER_PASSWORD = "admin";
     private static final String TEST_DATA_FOLDER_NAME = "test_data";
@@ -80,8 +79,9 @@ public class LoadTester extends TestCase
             nodeService.deleteNode(ch);
         }
 
+        // DH: Do not assume the presence of a path for the IMAP home.  Create the IMAP home and set it on the service.
         NodeRef adminNodeRef = searchService.selectNodes(rootRef, "/app:company_home/imap:imap_home/cm:admin", null, namespaceService, false).get(0);
-        importTestData("test-resources/load_test_data.acp", adminNodeRef);
+        importTestData("test-resources/imap/load_test_data.acp", adminNodeRef);
 
 
         AlfrescoImapFolder testDataFolder = imapService.getFolder(user, TEST_DATA_FOLDER_NAME);
diff --git a/source/test-resources/imap/imapservice_test_folder_a.acp b/source/test-resources/imap/imapservice_test_folder_a.acp
new file mode 100644
index 0000000000..11ba385da2
Binary files /dev/null and b/source/test-resources/imap/imapservice_test_folder_a.acp differ
diff --git a/source/test-resources/imap/load_test_data.acp b/source/test-resources/imap/load_test_data.acp
new file mode 100644
index 0000000000..1e34899c40
Binary files /dev/null and b/source/test-resources/imap/load_test_data.acp differ