Index: api/test/java/javax/jdo/PMFMapMapTest.java
===================================================================
--- api/test/java/javax/jdo/PMFMapMapTest.java	(revision 1821035)
+++ api/test/java/javax/jdo/PMFMapMapTest.java	(working copy)
@@ -395,10 +395,11 @@
                 expectedDriverNameWithOverrides);
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader pmfLoader = getClass().getClassLoader();
 
         try {
             pmf = JDOHelper.getPersistenceManagerFactory(overrides, PMFName,
-                    resourceClassLoader, resourceClassLoader);
+                    resourceClassLoader, pmfLoader);
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass. "
                     + ex.getMessage());
@@ -472,10 +473,11 @@
     public void testNamedPMFWithTwoLoaders() throws IOException {
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader pmfLoader = getClass().getClassLoader();
 
         try {
             pmf = JDOHelper.getPersistenceManagerFactory(PMFName,
-                    resourceClassLoader, resourceClassLoader);
+                    resourceClassLoader, pmfLoader);
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass. "
                     + ex.getMessage());