diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTest.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTest.java
deleted file mode 100644
index e49744fe63..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.dispatcher;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.matchers.JUnitMatchers;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.message.MessageDeliveryException;
-import org.springframework.integration.message.StringMessage;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- *
- * @author Iwein Fuld
- */
-public class AggregateMessageDeliveryExceptionTest {
-
-    private Message<?> message = new StringMessage("foo");
-    private AggregateMessageDeliveryException exception = new AggregateMessageDeliveryException(message, "something went wrong", exceptionsList());
-    private MessageDeliveryException firstProblem;
-
-    private List<? extends Exception> exceptionsList() {
-        firstProblem = new MessageDeliveryException(message, "first problem");
-        return Arrays.asList(
-                firstProblem,
-                new MessageDeliveryException(message,"second problem"),
-                new MessageDeliveryException(message, "third problem")
-        );
-
-    }
-
-    @Test
-    @Ignore //turn this on if you want to read the message and stacktrace in the console
-    public void shouldThrow(){
-        throw exception;
-    }
-
-    @Test
-    public void shouldShowOriginalExceptionsInMessage() {
-        assertThat(exception.getMessage(), JUnitMatchers.containsString("first problem"));
-        assertThat(exception.getMessage(), JUnitMatchers.containsString("second problem"));
-        assertThat(exception.getMessage(), JUnitMatchers.containsString("third problem"));
-    }
-    
-    @Test
-    public void shouldShowFirstOriginalExceptionInCause() {
-        assertThat((MessageDeliveryException) exception.getCause(), is(firstProblem));
-    }
-}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java
new file mode 100644
index 0000000000..c3fa1f8245
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.dispatcher;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.matchers.JUnitMatchers;
+import org.springframework.integration.core.Message;
+import org.springframework.integration.message.MessageDeliveryException;
+import org.springframework.integration.message.StringMessage;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Iwein Fuld
+ */
+public class AggregateMessageDeliveryExceptionTests {
+
+	private Message<?> message = new StringMessage("foo");
+
+	private AggregateMessageDeliveryException exception = new AggregateMessageDeliveryException(message,
+			"something went wrong", exceptionsList());
+
+	private MessageDeliveryException firstProblem;
+
+
+	private List<? extends Exception> exceptionsList() {
+		firstProblem = new MessageDeliveryException(message, "first problem");
+		return Arrays.asList(firstProblem, new MessageDeliveryException(message, "second problem"),
+				new MessageDeliveryException(message, "third problem"));
+
+	}
+
+	@Test
+	@Ignore
+	// turn this on if you want to read the message and stacktrace in the
+	// console
+	public void shouldThrow() {
+		throw exception;
+	}
+
+	@Test
+	public void shouldShowOriginalExceptionsInMessage() {
+		assertThat(exception.getMessage(), JUnitMatchers.containsString("first problem"));
+		assertThat(exception.getMessage(), JUnitMatchers.containsString("second problem"));
+		assertThat(exception.getMessage(), JUnitMatchers.containsString("third problem"));
+	}
+
+	@Test
+	public void shouldShowFirstOriginalExceptionInCause() {
+		assertThat((MessageDeliveryException) exception.getCause(), is(firstProblem));
+	}
+
+}