diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/aggregation-resend-config.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests-context.xml
similarity index 100%
rename from org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/aggregation-resend-config.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests-context.xml
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTest.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java
similarity index 96%
rename from org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTest.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java
index 881acadada..32282db258 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTest.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java
@@ -38,9 +38,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  * @author Iwein Fuld
  */
-@ContextConfiguration(locations = {"aggregation-resend-config.xml"})
+@ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class AggregationResendTest {
+public class AggregationResendTests {
 
 	@Autowired
 	DirectChannel input_for_aggregator_with_explicit_timeout;