diff --git a/samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java b/samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java
index 452c496a33..18bfef64b0 100644
--- a/samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java
+++ b/samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java
@@ -5,17 +5,31 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.cloud.stream.messaging.Sink;
+import org.springframework.stereotype.Component;
 
 @SpringBootApplication
 @EnableBinding(Sink.class)
 public class ContractVerifierSampleStreamSinkApplication {
 
-	@StreamListener(Sink.INPUT)
-	public void logSensorData(SensorData data) {
-		System.out.println(data);
-	}
+
 
 	public static void main(String[] args) {
 		SpringApplication.run(ContractVerifierSampleStreamSinkApplication.class, args);
 	}
 }
+
+@Component
+class Listener {
+
+	int count = 0;
+
+	@StreamListener(Sink.INPUT)
+	public void logSensorData(SensorData data) {
+		System.out.println(data);
+		this.count = this.count + 1;
+	}
+
+	public int getCount() {
+		return this.count;
+	}
+}
\ No newline at end of file
diff --git a/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java
index bfb0d6c087..29bc549f0e 100644
--- a/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java
+++ b/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java
@@ -46,13 +46,12 @@ public class MessageConsumedTests {
 	StubTrigger stubTrigger;
 
 	@Autowired
-	@Qualifier(Sink.INPUT)
-	SubscribableChannel input;
+	Listener listener;
 
 	@Test
 	public void testMessageConsumed() throws Exception {
-		int count = ((MessageChannelMetrics) input).getSendCount();
+		int count = this.listener.getCount();
 		stubTrigger.trigger("sensor1");
-		assertThat(((MessageChannelMetrics) input).getSendCount()).isEqualTo(count + 1);
+		assertThat(this.listener.getCount()).isEqualTo(count + 1);
 	}
 }