diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java b/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
index 528fdc4b1c..9425776eff 100644
--- a/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
@@ -1,15 +1,11 @@
 package org.apache.activemq.kaha;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Map;
-import org.apache.activemq.kaha.ListContainer;
-import org.apache.activemq.kaha.Store;
-import org.apache.activemq.kaha.StoreFactory;
+
 import junit.framework.TestCase;
 
 public class ListContainerTest extends TestCase{
@@ -310,6 +306,9 @@ public class ListContainerTest extends TestCase{
 
     protected void tearDown() throws Exception{
         super.tearDown();
+        if( store!= null ) {
+        	store.close();
+        }
         assertTrue(StoreFactory.delete(name));
     }
 }
diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java b/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
index 3304a48202..ea793d12fc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
@@ -173,6 +173,10 @@ public class MapContainerTest extends TestCase{
 
     protected void tearDown() throws Exception{
         super.tearDown();
+        if( store != null ) {
+        	store.close();
+        	store=null;
+        }
         assertTrue(StoreFactory.delete(name));
     }
     
diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java b/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
index 7f1999ae1b..c06c710d02 100644
--- a/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
@@ -203,6 +203,11 @@ public class StoreTest extends TestCase{
 
     protected void tearDown() throws Exception{
         super.tearDown();
-        assertTrue(StoreFactory.delete(name));
+        if( store!=null ) {
+        	store.close();
+        	store=null;
+        }
+        boolean rc = StoreFactory.delete(name);
+        assertTrue(rc);
     }
 }