diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
index e3e42b6706..088d8867a3 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
@@ -76,7 +76,7 @@ import org.springframework.util.ObjectUtils;
 public class TestContextManager {
 
 	private static final String[] DEFAULT_TEST_EXECUTION_LISTENER_CLASS_NAMES = new String[] {
-		"org.springframework.test.context.web.WebTestExecutionListener",
+		"org.springframework.test.context.web.ServletTestExecutionListener",
 		"org.springframework.test.context.support.DependencyInjectionTestExecutionListener",
 		"org.springframework.test.context.support.DirtiesContextTestExecutionListener",
 		"org.springframework.test.context.transaction.TransactionalTestExecutionListener" };
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
similarity index 95%
rename from spring-test/src/main/java/org/springframework/test/context/web/WebTestExecutionListener.java
rename to spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
index 7df3caa902..86e9a9f2a0 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
@@ -33,14 +33,14 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletWebRequest;
 
 /**
- * TODO [SPR-9864] Document WebTestExecutionListener.
+ * TODO [SPR-9864] Document ServletTestExecutionListener.
  *
  * @author Sam Brannen
  * @since 3.2
  */
-public class WebTestExecutionListener extends AbstractTestExecutionListener {
+public class ServletTestExecutionListener extends AbstractTestExecutionListener {
 
-	private static final Log logger = LogFactory.getLog(WebTestExecutionListener.class);
+	private static final Log logger = LogFactory.getLog(ServletTestExecutionListener.class);
 
 
 	/**