diff --git a/bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java b/bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java
index e31b3fe2..3d0253a1 100644
--- a/bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java
+++ b/bindings/java/src/org/hyperic/sigar/test/SigarTestCase.java
@@ -27,7 +27,9 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
+import org.hyperic.sigar.Humidor;
 import org.hyperic.sigar.Sigar;
+import org.hyperic.sigar.ptql.ProcessQueryFactory;
 
 //helper to add optional tracing.
 public abstract class SigarTestCase extends TestCase {
@@ -80,6 +82,8 @@ public abstract class SigarTestCase extends TestCase {
             sigar.close();
             sigar = null;
         }
+        ProcessQueryFactory.getInstance().clear();
+        Humidor.getInstance().close();
     }
 
     public Properties getProperties() {