diff --git a/source/java/org/alfresco/RepositoryStartStopTest.java b/source/java/org/alfresco/RepositoryStartStopTest.java
index 39c1d89ee0..f4015754ea 100644
--- a/source/java/org/alfresco/RepositoryStartStopTest.java
+++ b/source/java/org/alfresco/RepositoryStartStopTest.java
@@ -168,10 +168,10 @@ public class RepositoryStartStopTest extends TestCase
      *  a context twice without error, using it
      *  when running. 
      *  
-     * DISABLED - the full context breaks
+     *  - the full context breaks
      *  when you close and re-open it!
      */
-    public void DISABLEDtestOpenCloseOpenCloseFull() throws Exception
+    public void testOpenCloseOpenCloseFull() throws Exception
     {
        assertNoCachedApplicationContext();
 
@@ -210,10 +210,10 @@ public class RepositoryStartStopTest extends TestCase
      *  4 different times, sometimes full ones,
      *  sometimes minimal ones with no autostart.
      *  
-     * DISABLED - the full context breaks
+     *  - the full context breaks
      *  when you close and re-open it!
      */
-    public void DISABLEDtestOpenCloseRepeatedly() throws Exception {
+    public void testOpenCloseRepeatedly() throws Exception {
        assertNoCachedApplicationContext();
 
        // Open the minimal one and test
diff --git a/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java b/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
index da28737b55..a21cc70e00 100644
--- a/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
+++ b/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
@@ -190,6 +190,14 @@ public class InternalEhCacheManagerFactoryBean implements FactoryBean<CacheManag
      */
     public void stop()
     {
+        // TODO: Does this port over different Locales?
+        // Better to override DbPersistenceServiceFactory#close to put a marker on the thread.
+        if (Thread.currentThread().getName().contains("Finalizer"))
+        {
+            // Probably JBPM's finalizer code ... we rely on Spring context calls rather
+            return;
+        }
+        
         synchronized (getClass())
         {
             if(logger.isDebugEnabled()) {
@@ -199,8 +207,11 @@ public class InternalEhCacheManagerFactoryBean implements FactoryBean<CacheManag
                }
             }
             
-            InternalEhCacheManagerFactoryBean.getInstance().shutdown();
-            initialized = false;
+            if (initialized)            // Avoid re-initialization if it has already been shut down
+            {
+                InternalEhCacheManagerFactoryBean.getInstance().shutdown();
+                initialized = false;
+            }
         }
     }