diff --git a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
index d6ba20eb87..299c9912fc 100644
--- a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
@@ -42,6 +42,10 @@ public class X509ProcessingFilterTests extends TestCase {
         super.setUp();
     }
 
+    public void tearDown() {
+        ContextHolder.setContext(null);
+    }
+
     public void testNormalOperation() throws Exception {
         MockHttpServletRequest request = new MockHttpServletRequest(null, new MockHttpSession());
         MockHttpServletResponse response = new MockHttpServletResponse();