diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java
index 4e77e187..d69ccb9a 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java
@@ -29,7 +29,11 @@ import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
 import org.springframework.webflow.test.MockExternalContext;
 
+/**
+ * Test case for {@link FlowExecutionImplFactory}.
+ */
 public class FlowExecutionImplFactoryTests extends TestCase {
+
 	private FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
 
 	private Flow flowDefinition = new SimpleFlow();
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java
index 392ca3f9..b6b6007e 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java
@@ -40,10 +40,8 @@ import org.springframework.webflow.test.MockExternalContext;
 import org.springframework.webflow.test.MockParameterMap;
 
 /**
- * Test case for FlowExecutionStack.
- * 
- * @see FlowExecutionImpl
- * 
+ * Test case for {@link FlowExecutionImplStateRestorer}.
+ *
  * @author Erwin Vervaet
  */
 public class FlowExecutionImplStateRestorerTests extends TestCase {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java
index 80c3b57d..02be0826 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java
@@ -20,6 +20,7 @@ import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
 
 public class InfiniteLoopTestAction extends MultiAction {
+
 	public Event method(RequestContext context) {
 		return success();
 	}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java
index ca5c6998..2d18efe2 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java
@@ -33,8 +33,13 @@ import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.execution.support.ApplicationView;
 import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockFlowServiceLocator;
 
+/**
+ * Miscellaneous flow execution tests.
+ */
 public class MiscFlowExecutionTests extends TestCase {
+
 	public void testRequestScopePutInEntryAction() {
 		Flow parentFlow = new Flow("parent");
 		Flow flow = new Flow("test");
@@ -76,16 +81,18 @@ public class MiscFlowExecutionTests extends TestCase {
 		}
 	}
 
-	/*
 	public void testInfiniteLoop() {
+		MockFlowServiceLocator serviceLocator = new MockFlowServiceLocator();
+		serviceLocator.registerBean("action", new InfiniteLoopTestAction());
 		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("infinite-loop.xml", getClass()));
+		builder.setFlowServiceLocator(serviceLocator);
 		Flow flow = new FlowAssembler("myFlow", builder).assembleFlow();
 		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
 		try {
 			execution.start(null, new MockExternalContext());
-		} catch (RequiredMappingException e) {
-			
+		}
+		catch (StackOverflowError e) {
+			// expected
 		}
 	}
-	*/
 }
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop-beans.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop-beans.xml
deleted file mode 100644
index 59b0f41c..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop-beans.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" 
-	"http://www.springframework.org/dtd/spring-beans.dtd">
-
-<!-- Application context definition -->
-
-<beans>
-
-	<bean id="action" class="org.springframework.webflow.execution.InfiniteLoopTestAction"/>
-	
-</beans>
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml
index d42f1902..091fd9fe 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml
@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
-
-	<start-state id="invokeAction" />
+<?xml version="1.0" encoding="UTF-8"?>
+<flow xmlns="http://www.springframework.org/schema/webflow"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/webflow
+		http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
+		
+	<start-state idref="invokeAction"/>
 
 	<action-state id="invokeAction">
 		<action bean="action" method="method"/>
-		<transition on="success" to="displayCustomer">
+		<transition on="success" to="end">
+			<!-- transition is not allowed to execute since second action signals error,
+			     as a result the source state will be re-entered, starting a loop... -->
 			<action bean="action" method="method"/>
 			<action bean="action" method="errorMethod"/>
 		</transition>
 	</action-state>
 		
-	<end-state id="displayCustomer" view="customer"/>
-	
-	<import resource="infinite-loop-beans.xml"/>
+	<end-state id="end"/>
 </flow>  
\ No newline at end of file