Index: src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
===================================================================
--- src/java/org/apache/jdo/tck/mapping/CompletenessTest.java	(Revision 398205)
+++ src/java/org/apache/jdo/tck/mapping/CompletenessTest.java	(Arbeitskopie)
@@ -49,9 +49,6 @@
     private final boolean isTestToBePerformed = isTestToBePerformed();
 
     /** */
-    private CompanyModelReader reader;
-    
-    /** */
     protected List rootOids;
     
     /** */
@@ -71,14 +68,10 @@
      */
     protected void localSetUp() {
         if (isTestToBePerformed) {
-            // register the default factory
-            CompanyFactoryRegistry.registerFactory();
-            // get new obj graph to compare persistent graph with
-            reader = new CompanyModelReader(inputFilename);
-            addTearDownClass(reader.getTearDownClassesFromFactory());
             getPM();
             CompanyFactoryRegistry.registerFactory(pm);
             CompanyModelReader reader = new CompanyModelReader(inputFilename);
+            addTearDownClass(reader.getTearDownClassesFromFactory());
             // persist test data
             pm.currentTransaction().begin();
             List rootList = reader.getRootList();
@@ -96,6 +89,10 @@
     /** */
     public void test() {
         if (isTestToBePerformed) {
+            // register the default factory
+            CompanyFactoryRegistry.registerFactory();
+            // get new obj graph to compare persistent graph with
+            CompanyModelReader reader = new CompanyModelReader(inputFilename);
             List rootList = reader.getRootList();
             
             getPM();