Index: tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java	(revision 712039)
+++ tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java	(working copy)
@@ -73,6 +73,14 @@
     private static final Integer one = new Integer(1);
     private static final Integer three = new Integer(3);
 
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(PCPoint2.class);
+        super.localSetUp();
+    }
+
     /** */
     public void test () {
         pm = getPM();
Index: tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java	(revision 712039)
+++ tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java	(working copy)
@@ -74,6 +74,14 @@
     private Object p4oid = null;
     private Object p5oid = null;
     
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(VersionedPCPoint.class);
+        super.localSetUp();
+    }
+
     /** */
     public void test() {
         pm = getPM();