diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
index 6e36ec72e3..8ef1dab27a 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
@@ -68,4 +68,8 @@ public class AuthorizeTagAttributeTests extends TestCase {
 
         ContextHolder.setContext(context);
     }
+    
+    protected void tearDown() throws Exception {
+		ContextHolder.setContext(null);
+	}
 }
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
index 257889ee2e..2e53784dd6 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
@@ -109,4 +109,8 @@ public class AuthorizeTagTests extends TestCase {
 
         ContextHolder.setContext(context);
     }
+
+    protected void tearDown() throws Exception {
+		ContextHolder.setContext(null);
+	}
 }