Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java	(working copy)
@@ -52,13 +52,6 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
-        closePMF();
-        super.setUp();
-    }
-
-    /** */
     public void test() {
         PersistenceManager pm = null;
         try {
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java	(working copy)
@@ -57,20 +57,13 @@
         BatchTestRunner.run(GetPersistenceManagerFactoryByPropertiesInstance.class);
     }
 
-    /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
-        closePMF();
-        PMFPropertiesObject = loadProperties(PMFProperties);
-        pmf = JDOHelper.getPersistenceManagerFactory(PMFPropertiesObject);
-        localSetUp();
-    }
-
     /**
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
         addTearDownClass(Company.class);
+        PMFPropertiesObject = loadProperties(PMFProperties);
+        pmf = JDOHelper.getPersistenceManagerFactory(PMFPropertiesObject);
     }
 
     /** */
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java	(working copy)
@@ -61,9 +61,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
-        closePMF();
+    protected void localSetUp() {
         Properties props = loadProperties(PMFProperties);
         username = (String)props.remove(CONNECTION_USERNAME_PROP);
         password = (String)props.remove(CONNECTION_PASSWORD_PROP);
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionPassword.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionPassword.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionPassword.java	(working copy)
@@ -52,8 +52,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
         password = getPMFProperty(CONNECTION_PASSWORD_PROP);
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java	(working copy)
@@ -56,8 +56,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
         url = getPMFProperty(CONNECTION_URL_PROP);
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java	(working copy)
@@ -55,8 +55,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
         username = getPMFProperty(CONNECTION_USERNAME_PROP);
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java	(working copy)
@@ -51,8 +51,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
     }
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java	(working copy)
@@ -55,8 +55,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
     }
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java	(working copy)
@@ -52,8 +52,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
     }
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java	(working copy)
@@ -52,8 +52,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
     }
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetOptimistic.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetOptimistic.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetOptimistic.java	(working copy)
@@ -51,8 +51,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
     }
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java	(working copy)
@@ -53,8 +53,7 @@
     }
 
     /** */
-    protected void setUp() throws Exception {
-        // close pmf that might be left open from previous test
+    protected void localSetUp() {
         closePMF();
         pmf = getUnconfiguredPMF();
     }
Index: src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java
===================================================================
--- src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java	(working copy)
@@ -74,3 +74,4 @@
         }
     }  
 }
+
Index: src/java/org/apache/jdo/tck/JDO_Test.java
===================================================================
--- src/java/org/apache/jdo/tck/JDO_Test.java	(revision 539089)
+++ src/java/org/apache/jdo/tck/JDO_Test.java	(working copy)
@@ -232,7 +232,7 @@
     private Collection tearDownClasses = new LinkedList();
     
     /** */
-    protected void setUp() throws Exception {
+    protected final void setUp() throws Exception {
         pmf = getPMF();
         localSetUp();
     }
@@ -247,7 +247,7 @@
      * Runs the bare test sequence.
      * @exception Throwable if any exception is thrown
      */
-    public void runBare() throws Throwable {
+    public final void runBare() throws Throwable {
         try {
             testSucceeded = false;
             setUp();