diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java
index 38eab08a0..273311994 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java
@@ -37,7 +37,9 @@
  * 
  * @author Keith Donald
  * @author Scott Andrews
+ * @deprecated
  */
+@Deprecated
 public abstract class AbstractExternalizedFlowExecutionTests extends AbstractFlowExecutionTests {
 
 	/**
@@ -140,6 +142,7 @@ protected ResourceLoader createResourceLoader() {
 		return new DefaultResourceLoader();
 	}
 
+	@Override
 	protected final FlowDefinition getFlowDefinition() {
 		if (isCacheFlowDefinition() && cachedFlowDefinition != null) {
 			return cachedFlowDefinition;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java
index e1ad45c2d..d40677b31 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java
@@ -52,7 +52,9 @@
  * typically with a mock service layer.
  * 
  * @author Keith Donald
+ * @deprecated
  */
+@Deprecated
 public abstract class AbstractFlowExecutionTests extends TestCase {
 
 	/**
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java
index 91b1e43cc..fd3c3d1d5 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java
@@ -55,7 +55,9 @@
  * @author Keith Donald
  * @author Erwin Vervaet
  * @author Scott Andrews
+ * @deprecated
  */
+@Deprecated
 public abstract class AbstractXmlFlowExecutionTests extends AbstractExternalizedFlowExecutionTests {
 
 	private FlowModelRegistry flowModelRegistry = new FlowModelRegistryImpl();
@@ -76,12 +78,14 @@ public AbstractXmlFlowExecutionTests(String name) {
 		super(name);
 	}
 
+	@Override
 	protected final FlowBuilder createFlowBuilder(FlowDefinitionResource resource) {
 		registerDependentFlowModels();
 		FlowModelBuilder modelBuilder = new XmlFlowModelBuilder(resource.getPath(), flowModelRegistry);
 		FlowModelHolder modelHolder = new DefaultFlowModelHolder(modelBuilder);
 		flowModelRegistry.registerFlowModel(resource.getId(), modelHolder);
 		return new FlowModelFlowBuilder(modelHolder) {
+			@Override
 			protected void registerFlowBeans(ConfigurableBeanFactory flowBeanFactory) {
 				registerMockFlowBeans(flowBeanFactory);
 			}