diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java
index c691223e..f13648f0 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java
@@ -321,7 +321,7 @@ public class FlowModelFlowBuilderTests extends TestCase {
 	}
 
 	public void testResourceBackedFlowBuilderWithMessages() {
-		ClassPathResource resource = new ClassPathResource("resources/flow.xml", XmlFlowModelBuilderTests.class);
+		ClassPathResource resource = new ClassPathResource("resources/flow.xml", FlowModelFlowBuilderTests.class);
 		Flow flow = getFlow(resource);
 		assertNotNull(flow.getApplicationContext());
 		assertEquals("bar", flow.getApplicationContext().getMessage("foo", null, null));
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/resources/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/resources/flow.xml
deleted file mode 100644
index 00011745..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/resources/flow.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<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-2.0.xsd">
-
-	<end-state id="end"/>
-
-</flow>
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/resources/messages.properties b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/resources/messages.properties
deleted file mode 100644
index 74d0a43f..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/resources/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo=bar