diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java
index cf42886e68..0d8bae4e1a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java
@@ -45,7 +45,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.integration.StaticMessageHeaderAccessor;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.channel.QueueChannel;
@@ -54,6 +53,7 @@ import org.springframework.integration.store.MessageGroup;
 import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.integration.store.SimpleMessageStore;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.support.StaticMessageHeaderAccessor;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.test.util.TestUtils.TestApplicationContext;
 import org.springframework.messaging.Message;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTests.java
similarity index 97%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java
rename to spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTests.java
index abe999610c..7a03d93411 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTests.java
@@ -42,16 +42,18 @@ import org.springframework.messaging.MessageChannel;
 
 /**
  * @author Gary Russell
+ *
  * @since 3.0
  *
  */
-public class RouterConcurrencyTest {
+public class RouterConcurrencyTests {
 
 	@Test
 	public void test() throws Exception {
 		final AtomicInteger count = new AtomicInteger();
 		final Semaphore semaphore = new Semaphore(1);
 		final AbstractMessageRouter router = new AbstractMessageRouter() {
+
 			@Override
 			protected Collection<MessageChannel> determineTargetChannels(Message<?> message) {
 				return null;
@@ -85,8 +87,7 @@ public class RouterConcurrencyTest {
 		router.setBeanFactory(beanFactory);
 
 		ExecutorService exec = Executors.newFixedThreadPool(2);
-		final List<ConversionService> returns = Collections.synchronizedList(
-				new ArrayList<ConversionService>());
+		final List<ConversionService> returns = Collections.synchronizedList(new ArrayList<>());
 		Runnable runnable = () -> {
 			ConversionService requiredConversionService = router.getRequiredConversionService();
 			returns.add(requiredConversionService);