diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index 4964e5fbd0..224d4cbed4 100644
--- a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -46,7 +46,7 @@ import org.springframework.util.Assert;
 
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletRequest}
- * interface. Supports the Servlet 2.4 API level.
+ * interface. Supports the Servlet 2.5 API level.
  *
  * <p>Used for testing the web framework; also useful for testing
  * application controllers.
@@ -447,7 +447,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.parameters.get(name);
 	}
 
-	public Map getParameterMap() {
+	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
 
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index ca98ae991f..efaea64ded 100644
--- a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -41,7 +41,7 @@ import org.springframework.web.util.WebUtils;
 
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletResponse}
- * interface. Supports the Servlet 2.4 API level.
+ * interface. Supports the Servlet 2.5 API level.
  *
  * <p>Used for testing the web framework; also useful for testing
  * application controllers.
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java
index 6a75613fe2..6de51d391c 100644
--- a/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -34,6 +34,7 @@ import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.el.ExpressionEvaluator;
 import javax.servlet.jsp.el.VariableResolver;
+import javax.el.ELContext;
 
 import org.springframework.util.Assert;
 
@@ -277,8 +278,12 @@ public class MockPageContext extends PageContext {
 		return new MockExpressionEvaluator(this);
 	}
 
+	public ELContext getELContext() {
+		throw new UnsupportedOperationException("getELContext");
+	}
+
 	public VariableResolver getVariableResolver() {
-		return null;
+		throw new UnsupportedOperationException("getVariableResolver");
 	}
 
 	public HttpSession getSession() {
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
index 071d89e5f8..55edd042a4 100644
--- a/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
+++ b/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -188,7 +188,7 @@ public class MockServletContext implements ServletContext {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
-	public Set getResourcePaths(String path) {
+	public Set<String> getResourcePaths(String path) {
 		String actualPath = (path.endsWith("/") ? path : path + "/");
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
 		try {