diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml
similarity index 92%
rename from org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml
index cb18e4db72..29f1c34688 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml
@@ -15,8 +15,8 @@
 	<channel id="input" />
 	<channel id="output" />
 
-	<b:bean id="service" class="org.springframework.integration.config.xml.ConstructorAutowireTest$TestService" />
-	<b:bean id="endpoint" class="org.springframework.integration.config.xml.ConstructorAutowireTest$TestEndpoint" />
+	<b:bean id="service" class="org.springframework.integration.config.xml.ConstructorAutowireTests$TestService" />
+	<b:bean id="endpoint" class="org.springframework.integration.config.xml.ConstructorAutowireTests$TestEndpoint" />
 
 	<inbound-channel-adapter ref="endpoint" method="aProducer" channel="input">
 		<poller max-messages-per-poll="1">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests.java
similarity index 80%
rename from org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests.java
index 2efa74f585..198d45f6bf 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,22 @@ package org.springframework.integration.config.xml;
 import java.util.List;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Jim Moore
  * @author Mark Fisher
  */
-public class ConstructorAutowireTest {
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ConstructorAutowireTests {
 
 	@Test // INT-568
 	public void testApplicationContextCreation() {
-		new ClassPathXmlApplicationContext("ConstructorAutowireTest-context.xml", ConstructorAutowireTest.class);
 	}