diff --git a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
index 8549a14ea..393fca956 100644
--- a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+++ b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
@@ -18,16 +18,18 @@
  */
 package org.apache.struts2;
 
-import com.mockobjects.servlet.MockHttpServletRequest;
-import com.mockobjects.servlet.MockHttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
 import com.mockobjects.servlet.MockServletContext;
 import com.opensymphony.xwork2.ActionContext;
-import junit.framework.TestCase;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import junit.framework.TestCase;
 
 
 /**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
index 8014bf131..1be4dc6f1 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
@@ -25,13 +25,12 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Vector;
 
+import org.springframework.mock.web.MockHttpServletRequest;
+
 import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.http.HttpSession;
-
 import junit.framework.AssertionFailedError;
 
-import com.mockobjects.servlet.MockHttpServletRequest;
-
 
 /**
  * StrutsMockHttpServletRequest
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
index 5cf6adeb9..480e4717f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
@@ -22,7 +22,7 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.UUID;
 
-import com.mockobjects.servlet.MockHttpSession;
+import org.springframework.mock.web.MockHttpSession;
 
 
 /**