diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowBuilder.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowBuilder.java
index b525a9d..424f294 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowBuilder.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowBuilder.java
@@ -256,12 +256,12 @@ public final class IntegrationFlowBuilder {
 	}
 
 	public IntegrationFlowBuilder delay(String groupId, String expression,
-			EndpointConfigurer<GenericEndpointSpec<DelayHandler>> endpointConfigurer) {
+			EndpointConfigurer<DelayerEndpointSpec> endpointConfigurer) {
 		DelayHandler delayHandler = new DelayHandler(groupId);
 		if (StringUtils.hasText(expression)) {
 			delayHandler.setDelayExpression(PARSER.parseExpression(expression));
 		}
-		return this.register(new GenericEndpointSpec<DelayHandler>(delayHandler), endpointConfigurer);
+		return this.register(new DelayerEndpointSpec(delayHandler), endpointConfigurer);
 	}
 
 	public IntegrationFlowBuilder enrich(ComponentConfigurer<EnricherSpec> enricherConfigurer) {
diff --git a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java
index b0a0e7e..c8b3c7b 100644
--- a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java
+++ b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java
@@ -1226,13 +1226,13 @@ public class IntegrationFlowTests {
 			return IntegrationFlows.from("bridgeFlow2Input")
 					.bridge(c -> c.autoStartup(false).id("bridge"))
 					.fixedSubscriberChannel()
-					.delay("delayer", "200", c -> c.advice(this.delayedAdvice))
+					.delay("delayer", "200", c -> c.advice(this.delayedAdvice).messageStore(this.messageStore()))
 					.channel(MessageChannels.queue("bridgeFlow2Output"))
 					.get();
 		}
 
 		@Bean
-		public MessageStore messageStore() {
+		public SimpleMessageStore messageStore() {
 			return new SimpleMessageStore();
 		}