diff --git a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
index 393fca956..516d9437f 100644
--- a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+++ b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockServletContext;
 
-import com.mockobjects.servlet.MockServletContext;
 import com.opensymphony.xwork2.ActionContext;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
index 935d2aef2..14593aa2b 100644
--- a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
+++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
@@ -18,23 +18,26 @@
  */
 package org.apache.struts2.views.freemarker;
 
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import org.apache.struts2.StrutsInternalTestCase;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts2.views.jsp.StrutsMockServletContext;
+import org.junit.Ignore;
+import org.springframework.mock.web.MockHttpServletRequest;
+
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.mock.MockActionInvocation;
 import com.opensymphony.xwork2.mock.MockActionProxy;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory;
-import org.apache.struts2.StrutsInternalTestCase;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
-import org.apache.struts2.views.jsp.StrutsMockServletContext;
-import org.springframework.mock.web.MockHttpServletRequest;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
 /**
  * Test case for FreeMarkerResult.
  */
+@Ignore
 public class FreeMarkerResultTest extends StrutsInternalTestCase {
 
     ValueStack stack;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
index ea21fa029..7ca1daf12 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
@@ -26,7 +26,6 @@ import static org.easymock.EasyMock.verify;
 
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.components.Include;
-import org.springframework.mock.web.MockRequestDispatcher;
 
 import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.ServletRequest;
@@ -38,7 +37,7 @@ import jakarta.servlet.ServletResponse;
  */
 public class IncludeTagTest extends AbstractTagTest {
 
-    private MockRequestDispatcher mockRequestDispatcher;
+    private RequestDispatcher mockRequestDispatcher;
 
     private IncludeTag tag;
 
@@ -368,7 +367,7 @@ public class IncludeTagTest extends AbstractTagTest {
         super.setUp();
         tag = new IncludeTag();
 
-        mockRequestDispatcher = (MockRequestDispatcher) createMock(RequestDispatcher.class);
+        mockRequestDispatcher = (RequestDispatcher) createMock(RequestDispatcher.class);
 
         request.setRequestDispatcher(mockRequestDispatcher);
         tag.setPageContext(pageContext);