diff --git a/gss/src/test/java/org/globus/gsi/gssapi/test/GlobusGSSContextTest.java b/gss/src/test/java/org/globus/gsi/gssapi/test/GlobusGSSContextTest.java
index <HASH>..<HASH> 100644
--- a/gss/src/test/java/org/globus/gsi/gssapi/test/GlobusGSSContextTest.java
+++ b/gss/src/test/java/org/globus/gsi/gssapi/test/GlobusGSSContextTest.java
@@ -62,6 +62,16 @@ public class GlobusGSSContextTest extends TestCase {
 
 	System.setProperty("org.globus.gsi.gssapi.provider",
 			   "org.globus.gsi.gssapi.GlobusGSSManagerImpl");
+        if (clientContext != null) {
+            clientContext.dispose();
+            clientContext = null;
+        }
+
+        if (serverContext != null) {
+            serverContext.dispose();
+            serverContext = null;
+        }
+
 
 	GSSManager manager = getGSSManager();
 
@@ -82,10 +92,12 @@ public class GlobusGSSContextTest extends TestCase {
     protected void tearDown() throws Exception {
 	if (clientContext != null) {
 	    clientContext.dispose();
+	    clientContext = null;
 	}
 
 	if (serverContext != null) {
 	    serverContext.dispose();
+	    serverContext = null;
 	}
     }
These fixes take of the issue that was visible on certain non-server
class machines where Java was allocating <I>MB max.