diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
index 347c2e507..ea1ecaf71 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
@@ -135,5 +135,15 @@ public abstract class AbstractTagTest extends StrutsTestCase {
         super.tearDown();
         pageContext.verify();
         request.verify();
+        action = null;
+        context = null;
+        session = null;
+        stack = null;
+        writer = null;
+        request = null;
+        pageContext = null;
+        response = null;
+        servletContext = null;
+        mockContainer = null;
     }
 }
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
index 034f1e6dd..f5101ec6c 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
@@ -260,6 +260,7 @@ public class DateTagTest extends AbstractTagTest {
 
     protected void tearDown() throws Exception {
         super.tearDown();
+        tag = null;
     }
 
 }