diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericWebContextLoader.java
index 6f7946a34b9..5b34d7aa6b7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericWebContextLoader.java
@@ -34,7 +34,7 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
 /**
- * TODO [SPR-5243] Document AbstractGenericWebContextLoader.
+ * TODO [SPR-9864] Document AbstractGenericWebContextLoader.
  *
  * @author Sam Brannen
  * @since 3.2
@@ -47,7 +47,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	// --- SmartContextLoader -----------------------------------------------
 
 	/**
-	 * TODO [SPR-5243] Document overridden loadContext(MergedContextConfiguration).
+	 * TODO [SPR-9864] Document overridden loadContext(MergedContextConfiguration).
 	 *
 	 * @see org.springframework.test.context.SmartContextLoader#loadContext(org.springframework.test.context.MergedContextConfiguration)
 	 */
@@ -78,7 +78,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	}
 
 	/**
-	 * TODO [SPR-5243] Document configureWebResources().
+	 * TODO [SPR-9864] Document configureWebResources().
 	 */
 	protected void configureWebResources(GenericWebApplicationContext context,
 			WebMergedContextConfiguration webMergedConfig) {
@@ -93,20 +93,20 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	}
 
 	/**
-	 * TODO [SPR-5243] Document customizeBeanFactory().
+	 * TODO [SPR-9864] Document customizeBeanFactory().
 	 */
 	protected void customizeBeanFactory(DefaultListableBeanFactory beanFactory,
 			WebMergedContextConfiguration webMergedConfig) {
 	}
 
 	/**
-	 * TODO [SPR-5243] Document loadBeanDefinitions().
+	 * TODO [SPR-9864] Document loadBeanDefinitions().
 	 */
 	protected abstract void loadBeanDefinitions(GenericWebApplicationContext context,
 			WebMergedContextConfiguration webMergedConfig);
 
 	/**
-	 * TODO [SPR-5243] Document customizeContext().
+	 * TODO [SPR-9864] Document customizeContext().
 	 */
 	protected void customizeContext(GenericWebApplicationContext context, WebMergedContextConfiguration webMergedConfig) {
 	}
@@ -114,7 +114,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	// --- ContextLoader -------------------------------------------------------
 
 	/**
-	 * TODO [SPR-5243] Document overridden loadContext(String...).
+	 * TODO [SPR-9864] Document overridden loadContext(String...).
 	 *
 	 * @see org.springframework.test.context.ContextLoader#loadContext(java.lang.String[])
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
index 76b748a2635..f539869ab8a 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
 /**
- * TODO [SPR-5243] Document AnnotationConfigContextLoaderUtils.
+ * TODO [SPR-9864] Document AnnotationConfigContextLoaderUtils.
  *
  * @author Sam Brannen
  * @since 3.2
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigWebContextLoader.java
index fe6cda09cba..ecb69c88410 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigWebContextLoader.java
@@ -25,7 +25,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
 /**
- * TODO [SPR-5243] Document AnnotationConfigWebContextLoader.
+ * TODO [SPR-9864] Document AnnotationConfigWebContextLoader.
  *
  * @author Sam Brannen
  * @since 3.2
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/XmlWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/XmlWebContextLoader.java
index f3eaad45097..154ecd485af 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/XmlWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/XmlWebContextLoader.java
@@ -21,7 +21,7 @@ import org.springframework.test.context.web.WebMergedContextConfiguration;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
 /**
- * TODO [SPR-5243] Document XmlWebContextLoader.
+ * TODO [SPR-9864] Document XmlWebContextLoader.
  *
  * @author Sam Brannen
  * @since 3.2
@@ -36,7 +36,7 @@ public class XmlWebContextLoader extends AbstractGenericWebContextLoader {
 	}
 
 	/**
-	 * TODO [SPR-5243] Document overridden loadBeanDefinitions().
+	 * TODO [SPR-9864] Document overridden loadBeanDefinitions().
 	 *
 	 * @see org.springframework.test.context.support.AbstractGenericWebContextLoader#loadBeanDefinitions(org.springframework.web.context.support.GenericWebApplicationContext, org.springframework.test.context.web.WebMergedContextConfiguration)
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java
index 3b84965feb6..1dfa0478e0c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * TODO [SPR-5243] Document WebAppConfiguration.
+ * TODO [SPR-9864] Document WebAppConfiguration.
  * 
  * @author Sam Brannen
  * @since 3.2
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
index c5a0dc6c2a5..fc2c351e31b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
@@ -27,7 +27,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * TODO [SPR-5243] Document WebMergedContextConfiguration.
+ * TODO [SPR-9864] Document WebMergedContextConfiguration.
  *
  * @author Sam Brannen
  * @since 3.2
@@ -40,7 +40,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 
 
 	/**
-	 * TODO [SPR-5243] Document WebMergedContextConfiguration constructor.
+	 * TODO [SPR-9864] Document WebMergedContextConfiguration constructor.
 	 */
 	public WebMergedContextConfiguration(
 			Class<?> testClass,
@@ -55,7 +55,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 	}
 
 	/**
-	 * TODO [SPR-5243] Document getResourceBasePath().
+	 * TODO [SPR-9864] Document getResourceBasePath().
 	 */
 	public String getResourceBasePath() {
 		return this.resourceBasePath;
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/WebTestExecutionListener.java
index 46a2e0fdc58..7df3caa9028 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/WebTestExecutionListener.java
@@ -33,7 +33,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletWebRequest;
 
 /**
- * TODO [SPR-5243] Document WebTestExecutionListener.
+ * TODO [SPR-9864] Document WebTestExecutionListener.
  *
  * @author Sam Brannen
  * @since 3.2
@@ -44,7 +44,7 @@ public class WebTestExecutionListener extends AbstractTestExecutionListener {
 
 
 	/**
-	 * TODO [SPR-5243] Document overridden prepareTestInstance().
+	 * TODO [SPR-9864] Document overridden prepareTestInstance().
 	 *
 	 * @see org.springframework.test.context.support.AbstractTestExecutionListener#prepareTestInstance(org.springframework.test.context.TestContext)
 	 */
@@ -54,7 +54,7 @@ public class WebTestExecutionListener extends AbstractTestExecutionListener {
 	}
 
 	/**
-	 * TODO [SPR-5243] Document overridden beforeTestMethod().
+	 * TODO [SPR-9864] Document overridden beforeTestMethod().
 	 *
 	 * @see org.springframework.test.context.support.AbstractTestExecutionListener#beforeTestMethod(org.springframework.test.context.TestContext)
 	 */
@@ -64,7 +64,7 @@ public class WebTestExecutionListener extends AbstractTestExecutionListener {
 	}
 
 	/**
-	 * TODO [SPR-5243] Document setUpRequestContext().
+	 * TODO [SPR-9864] Document setUpRequestContext().
 	 *
 	 * @param testContext
 	 * @param servletContext
@@ -107,7 +107,7 @@ public class WebTestExecutionListener extends AbstractTestExecutionListener {
 	}
 
 	/**
-	 * TODO [SPR-5243] Document overridden afterTestMethod().
+	 * TODO [SPR-9864] Document overridden afterTestMethod().
 	 *
 	 * @see org.springframework.test.context.support.AbstractTestExecutionListener#afterTestMethod(org.springframework.test.context.TestContext)
 	 */