Index: test/java/javax/jdo/PMFMapMapTest.java
===================================================================
--- test/java/javax/jdo/PMFMapMapTest.java	(revision 1816284)
+++ test/java/javax/jdo/PMFMapMapTest.java	(working copy)
@@ -46,7 +46,6 @@
     Properties props;
     Properties overrides;
     URLClassLoader resourceClassLoader;
-    ClassLoader saveContextClassLoader;
 
     public static void main(String args[]) {
         BatchTestRunner.run(PMFMapMapTest.class);
@@ -89,6 +88,7 @@
     public void testJDOConfigXML() throws IOException {
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader saveContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(resourceClassLoader);
 
         try {
@@ -96,6 +96,8 @@
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass."
                     + ex.getMessage());
+        } finally {
+            Thread.currentThread().setContextClassLoader(saveContextClassLoader);
         }
 
         String driverName = pmf.getConnectionDriverName();
@@ -137,6 +139,7 @@
     public void testPropsFile() throws IOException {
 
         setupResourceClassLoader(propsDir);
+        ClassLoader saveContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(resourceClassLoader);
 
         try {
@@ -144,6 +147,8 @@
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass."
                     + ex.getMessage());
+        } finally {
+            Thread.currentThread().setContextClassLoader(saveContextClassLoader);
         }
 
         String driverName = pmf.getConnectionDriverName();
@@ -199,6 +204,7 @@
                 outstream.toByteArray());
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader saveContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(resourceClassLoader);
 
         try {
@@ -206,6 +212,8 @@
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass."
                     + ex.getMessage());
+        } finally {
+            Thread.currentThread().setContextClassLoader(saveContextClassLoader);
         }
 
         String driverName = pmf.getConnectionDriverName();
@@ -266,6 +274,7 @@
         props.setProperty(PROPERTY_CONNECTION_DRIVER_NAME, expectedDriverName);
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader saveContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(resourceClassLoader);
         try {
             pmf = JDOHelper.getPersistenceManagerFactory(props);
@@ -272,6 +281,8 @@
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass."
                     + ex.getMessage());
+        } finally {
+            Thread.currentThread().setContextClassLoader(saveContextClassLoader);
         }
 
         String driverName = pmf.getConnectionDriverName();
@@ -319,6 +330,7 @@
                 expectedDriverNameWithOverrides);
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader saveContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(resourceClassLoader);
 
         try {
@@ -326,6 +338,8 @@
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass."
                     + ex.getMessage());
+        } finally {
+            Thread.currentThread().setContextClassLoader(saveContextClassLoader);
         }
 
         String driverName = pmf.getConnectionDriverName();
@@ -384,8 +398,7 @@
 
         try {
             pmf = JDOHelper.getPersistenceManagerFactory(overrides, PMFName,
-                    resourceClassLoader, Thread.currentThread()
-                            .getContextClassLoader());
+                    resourceClassLoader, resourceClassLoader);
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass. "
                     + ex.getMessage());
@@ -407,6 +420,7 @@
     public void testNamedPMF() throws IOException {
 
         setupResourceClassLoader(resourceDir);
+        ClassLoader saveContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(resourceClassLoader);
 
         try {
@@ -414,6 +428,8 @@
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass. "
                     + ex.getMessage());
+        } finally {
+            Thread.currentThread().setContextClassLoader(saveContextClassLoader);
         }
 
         String driverName = pmf.getConnectionDriverName();
@@ -459,8 +475,7 @@
 
         try {
             pmf = JDOHelper.getPersistenceManagerFactory(PMFName,
-                    resourceClassLoader, Thread.currentThread()
-                            .getContextClassLoader());
+                    resourceClassLoader, resourceClassLoader);
         } catch (JDOFatalUserException ex) {
             fail("Failed to find PersistenceManagerFactoryClass. "
                     + ex.getMessage());